Merge branch 'dev' into refac/php-intelephense-maxfile-size

n3wborn · Sep 11, 2024 · 410a8dd · 410a8dd
2 parents 7d1926b + 7bd480b
commit 410a8dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/after/ftplugin/php.lua b/after/ftplugin/php.lua
@@ -5,7 +5,7 @@ local config = {
     root_dir = vim.fs.dirname(vim.fs.find({ '.git', 'composer.json' }, { upward = true })[1]),
     settings = {
         files = {
-            maxSize = 10000000, -- 10Mo
+            maxSize = 10000000, -- 10M
         },
         -- See https://github.com/bmewburn/intelephense-docs
     },

diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
@@ -1,12 +1,17 @@
 return {
-    'williamboman/mason.nvim',
-    cmd = {
-        'Mason',
-        'MasonUpdate',
-        'MasonInstall',
-        'MasonUninstall',
-        'MasonUninstallAll',
-        'MasonLog',
+    {
+        'williamboman/mason.nvim',
+        cmd = {
+            'Mason',
+            'MasonUpdate',
+            'MasonInstall',
+            'MasonUninstall',
+            'MasonUninstallAll',
+            'MasonLog',
+        },
+        config = function()
+            require('mason').setup()
+        end,
     },
     {
         'williamboman/mason-lspconfig.nvim',