fix: lsp-zero and treesitter setup scopes for LSPs

deomorxsy · deomorxsy · commit 97a2536d011f · 2025-02-07T06:47:49.000-03:00
fix: lean4 rice, organize the lazy lua script.
diff --git a/.config/nvim/Dockerfile b/.config/nvim/Dockerfile
@@ -5,7 +5,12 @@ ENV USER="nvim"
 
 RUN <<EOF
 apk upgrade && apk update && \
-     add --no-cache neovim python3 luarocks ripgrep git zig
+     add --no-cache neovim python3 luarocks ripgrep git zig node
+
+# zig: c compiler
+# node: provider for nvim's treesitter
+# python: provider for nvim
+
 EOF
 
 
@@ -28,6 +33,12 @@ pip3 install --no-cache-dir -r pynvim && \
 
 deactivate
 
+# set node provider
+# todo: set user for local npm install
+npm install -g nvim
+npm install -g tree-sitter-cli
+
+
 EOF
 
 
diff --git a/.config/nvim/after/plugin/lean.lua b/.config/nvim/after/plugin/lean.lua
@@ -1,3 +1,4 @@
+-- local lsp_zero = require('lsp-zero')
 -- Always show sign column.
 -- The sign column is used by the LSP support to show diagnostics
 -- (the E, W, etc. characters on the side)
@@ -38,7 +39,8 @@ local function on_attach(_, bufnr)
     end
 
     -- Autocomplete using the Lean language server
-    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+    --vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+    vim.api.nvim_set_option_value(bufnr, 'omnifunc', {'v:lua.vim.lsp.omnifunc'})
 
     -- Support for triggering code actions (e.g. "Try this:" suggestions from `simp?`)
     cmd('n', '<leader>a', vim.lsp.buf.code_action)
@@ -50,7 +52,8 @@ local function on_attach(_, bufnr)
     cmd('n', '<leader>N', function() vim.diagnostic.goto_prev{popup_opts = {show_header = false}} end)
 
     -- <leader>K will show all diagnostics for the current line in a popup window
-    cmd('n', '<leader>K', function() vim.diagnostic.open_float(0, { scope = "line", header = false, focus = false }) end)
+    -- cmd('n', '<leader>K', function() vim.diagnostic.open_float(0, { scope = "line", header = false, focus = false }) end)
+    cmd('n', '<leader>K', function() vim.diagnostic.open_float(nil, { scope = "line", header = false, focus = false }) end)
 
     -- <leader>q will load all errors in the current lean file into the location list
     -- (and then will open the location list)
diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua
@@ -1,19 +1,19 @@
 local lsp_zero = require('lsp-zero')
-
-lsp_zero.on_attach(function(client, bufnr)
-  local opts = {buffer = bufnr, remap = false}
-
-  vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-  vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-  vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-  vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-  vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
-  vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-  vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-  vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
-  vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-  vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-end)
+--
+-- lsp_zero.on_attach(function(client, bufnr)
+--   local opts = {buffer = bufnr, remap = false}
+--
+--   vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+--   vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
+--   vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
+--   vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
+--   vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
+--   vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
+--   vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
+--   vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
+--   vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
+--   vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+-- end)
 
 require('mason').setup({})
 require('mason-lspconfig').setup({
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
@@ -9,3 +9,4 @@ require("settings") -- user.set
 --require("user.packer")
 --require("plugins.packerSpecs") -- Ensure the plugins are loaded.
 
+-- configure treesitter
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
@@ -34,7 +34,9 @@ require("lazy").setup({
     },
 
 
-    { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', },
+    --{ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', },
+
+    {"nvim-treesitter/nvim-treesitter", build = ":TSUpdate"},
     { 'mbbill/undotree' },
     { 'ms-jpq/coq_nvim', branch = 'coq' },
 
@@ -50,6 +52,116 @@ require("lazy").setup({
     -- " - comment banner
     -- " - etc
 
+    -- lsp-zero
+    {
+      'VonHeikemen/lsp-zero.nvim',
+      branch = 'v3.x',
+      dependencies = {
+        --- Uncomment these if you want to manage LSP servers from neovim
+        {'williamboman/mason.nvim'},
+        {'williamboman/mason-lspconfig.nvim'},
+
+        -- Autocompletion
+        {
+            'hrsh7th/nvim-cmp',
+            event = 'InsertEnter',
+            config = function()
+                local cmp = require('cmp')
+
+                cmp.setup({
+                    sources = {
+                        {name = 'nvim_lsp'},
+                    },
+                    mapping = cmp.mapping.preset.insert({
+                        ['<C-space>'] = cmp.mapping.complete(),
+                        ['<C-u>'] = cmp.mapping.scroll_docs(-4),
+                        ['<C-d>'] = cmp.mapping.scroll_docs(4),
+                    }),
+                    snippet = {
+                        expand = function(args)
+                            vim.snippet.expand(args.body)
+                        end,
+                    },
+                })
+            end
+        },
+
+        -- LSP Support
+        {
+            'neovim/nvim-lspconfig',
+            cmd = "LspInfo",
+            event = {'BufReadPre', 'BufNewFile'},
+            dependencies = {
+                -- Autocompletion
+                {'hrsh7th/cmp-nvim-lsp'},
+            },
+            init = function ()
+                local lsp_defaults = require('lspconfig').util.default_config
+
+                -- add cmp_nvim_lsp capabilities settings to lspconfig
+                -- this should be executed before you configure any language server
+                lsp_defaults.capabilities = vim.tbl_deep_extend(
+                'force',
+                lsp_defaults.capabilities,
+                require('cmp_nvim_lsp').default_capabilities()
+                )
+
+                -- LspAttach is used to enable features when
+                -- there is a language server active for the file
+                vim.api.nvim_create_autocmd('LspAttach', {
+                    desc = 'LSP actions',
+                    callback = function (event)
+                        local opts = {buffer = event.buf}
+
+                        vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
+                        vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
+                        vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
+                        vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)
+                        vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
+                        vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', opts)
+                        vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
+                        vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
+                        vim.keymap.set({'n', 'x'}, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', opts)
+                        vim.keymap.set('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)
+
+                    end,
+                })
+
+                --require('lspconfig').gleam.setup({})
+                --require('lspconfig').ocamllsp.setup({})
+
+            end
+        },
+
+        -- Snippets
+        {'L3MON4D3/LuaSnip',lazy = true},
+
+        },
+    },
+
+    {'julian/lean.nvim'},
+    -- -- julian's lean.nvim LSP
+    --  {
+    --      'julian/lean.nvim',
+    --      dependencies = {
+    --          'VonHeikemen/lsp-zero.nvim',
+    --          --'neovim/nvim-lspconfig',
+    --          'nvim-lua/plenary.nvim',
+
+    --          -- Autocompletion
+    --          -- below already is being imported by
+    --          -- lsp-zero dependency tree
+
+    --          --'hrsh7th/nvim-cmp',
+    --          --'hrsh7th/cmp-nvim-lsp',
+    --          --'hrsh7th/cmp-buffer',
+    --          --'hrsh7th/cmp-path',
+    --      },
+    --      opts = {
+    --          mappings = true,
+    --      }
+    --  },
+
 
     -- "=====> https://github.com/andweeb/presence.nvim
     -- { 'andweeb/presence.nvim' }
@@ -120,28 +232,7 @@ require("lazy").setup({
     -- " Optional: better Rnoweb support (LaTeX completion)
     { 'lervag/vimtex' },
 
-    -- lsp-zero
-    {
-      'VonHeikemen/lsp-zero.nvim',
-      branch = 'v3.x',
-      dependencies = {
-        --- Uncomment these if you want to manage LSP servers from neovim
-        {'williamboman/mason.nvim'},
-        {'williamboman/mason-lspconfig.nvim'},
 
-        -- LSP Support
-        {'neovim/nvim-lspconfig'},
-
-        -- Autocompletion
-        {'hrsh7th/nvim-cmp'},
-        {'hrsh7th/cmp-nvim-lsp'},
-        {
-            'L3MON4D3/LuaSnip',
-            lazy = true
-        },
-
-        },
-    },
 
     -- NotebookNavigator for Python REPL
     {
@@ -201,24 +292,7 @@ require("lazy").setup({
         },
     },
 
-    -- julian's lean.nvim
-    {
-        'julian/lean.nvim',
-        dependencies = {
-            'VonHeikemen/lsp-zero.nvim',
-            --'neovim/nvim-lspconfig',
-            'nvim-lua/plenary.nvim',
 
-            -- Autocompletion
-            'hrsh7th/nvim-cmp',
-            --'hrsh7th/cmp-nvim-lsp',
-            --'hrsh7th/cmp-buffer',
-            --'hrsh7th/cmp-path',
-        },
-        opts = {
-            mappings = true,
-        }
-    }
   },
   -- Configure any other settings here. See the documentation for more details.
   -- colorscheme that will be used when installing plugins.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ luac.out
 # -- misc ignore
 scripts/brk_*.conf
 coq_deps.txt
+perlnavigator.txt

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ require("settings") -- user.set`
`9`	`9`	`--require("user.packer")`
`10`	`10`	`--require("plugins.packerSpecs") -- Ensure the plugins are loaded.`
`11`	`11`
	`12`	`+-- configure treesitter`