wip

init.lua

@@ -18,63 +18,3 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup("plugins")
-
---NVIM ANGULAR LSPCONFIG
---[[local project_library_path = "/usr/lib/node_modules/@angular/language-server/"
-local cmd = {
-	"ngserver", 
-	"--stdio",
-	"--tsProbeLocations",
-	project_library_path,
-	"--ngProbeLocations",
-	project_library_path,
-	"--19.2.1",
-	""
-}
-local filetypes = {
-    "typescript", 
-    "html", 
-    "ts" 
-}
-local root_markers={
-    "angular.json",
-    "nx.json"
-}
-
-vim.lsp.config('angularls', {
-      cmd = cmd,
-      filetypes = filetypes,
-      root_markers = root_markers
-})
-vim.lsp.enable('angularls')
-]]--
---NVIM-CMP
-config=function()
-    local cmp = require'cmp'
-    require("luasnip.loaders.from_vscode").lazy_load()
-      cmp.setup({
-	snippet = {
-	  -- REQUIRED - you must specify a snippet engine
-	  expand = function(args)
-	    require('luasnip').lsp_expand(args.body) 
-	  end,
-	},
-	window = {
-	  completion = cmp.config.window.bordered(),
-	  documentation = cmp.config.window.bordered(),
-	},
-	mapping = cmp.mapping.preset.insert({
-	  ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-	  ['<C-f>'] = cmp.mapping.scroll_docs(4),
-	  ['<C-Space>'] = cmp.mapping.complete(),
-	  ['<C-e>'] = cmp.mapping.abort(),
-	  ['<CR>'] = cmp.mapping.confirm({ select = true }), 
-	}),
-	sources = cmp.config.sources({
-	  --{ name = 'nvim_lsp' },
-	  { name = 'luasnip' }, 
-	}, {
-	  { name = 'buffer' },
-	})
-      })
-end

lazy-lock.json

@@ -6,15 +6,15 @@
   "hererocks": { "branch": "master", "commit": "160228946bed9998f5e3b168bd0b66ba2690f8f3" },
   "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
   "kanagawa": { "branch": "master", "commit": "27f1e119f3a7e6d11d435a59e3262e6affda1f83" },
-  "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" },
+  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
   "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "0c29e3795b9105d68390d2fdfd430409ef8c5d65" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "4c60a198e3f92098778a32a1c76d2bd7ba46a3b5" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-dap": { "branch": "master", "commit": "881f7dc17c0b4204a1d844732f95539575350e5b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "cc2f5f2fa28d240574808e78847978ed6ef20d2a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
   "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },

lua/plugins/completions.lua

@@ -3,51 +3,79 @@ return {
 	"hrsh7th/cmp-nvim-lsp",
     },
     {
-	'L3MON4AD3/LuaSnip',
+	"L3MON4AD3/LuaSnip",
-	dependencies ={
+	version="V2.*"
-	    'saadpawaiz1/cmp_luasnip',
-	    'rafamadriz/friendly-snippets'
-	},
     },
     {
-	'hrsh7th/nvim-cmp',
+	"saadpawaiz1/cmp_luasnip",
+    },
+    {
+	"rafamadriz/friendly-snippets"
+    },
+    {
+	"hrsh7th/nvim-cmp",
+	event = { "InsertEnter", "CmdlineEnter" },
 	config = function()
-	    -- Set up nvim-cmp.
+	    local luasnip = require("luasnip")
-	    local cmp = require'cmp'
+	    local cmp = require("cmp")
 	    require("luasnip.loaders.from_vscode").lazy_load()
 
 	    cmp.setup({
 		snippet = {
 		    expand = function(args)
-			require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+			require("luasnip").lsp_expand(args.body) 
 		    end,
 		},
 		window = {
 		    completion = cmp.config.window.bordered(),
 		    documentation = cmp.config.window.bordered(),
 		},
-		mapping = cmp.mapping.preset.insert({
+		mapping = {
-		    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+
-		    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+		    -- ... Your other mappings ...
-		    ['<C-Space>'] = cmp.mapping.complete(),
+		    ['<CR>'] = cmp.mapping(function(fallback)
-		    ['<C-e>'] = cmp.mapping.abort(),
+			if cmp.visible() then
-		    ['<CR>'] = cmp.mapping.confirm({ select = true }), 
+			    if luasnip.expandable() then
-		}),
+				luasnip.expand()
+			    else
+				cmp.confirm({
+				    select = true,
+				})
+			    end
+			else
+			    fallback()
+			end
+		    end),
+
+		    ["<Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    cmp.select_next_item()
+			elseif luasnip.locally_jumpable(1) then
+			    luasnip.jump(1)
+			else
+			    fallback()
+			end
+		    end, { "i", "s" }),
+
+		    ["<S-Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    cmp.select_prev_item()
+			elseif luasnip.locally_jumpable(-1) then
+			    luasnip.jump(-1)
+			else
+			    fallback()
+			end
+		    end, { "i", "s" }),
+		},
+
 		sources = cmp.config.sources({
-		    { name = 'nvim_lsp' },
+		    { name = "nvim_lsp" },
-		    { name = 'luasnip' }, -- For luasnip users.
+		    { name = "luasnip" },
 		}, {
-		    { name = 'buffer' },
+		    { name = "buffer" },
 		})
 	    })
 
-	    -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-	    cmp.setup.cmdline({ '/', '?' }, {
-		mapping = cmp.mapping.preset.cmdline(),
-		sources = {
-		    { name = 'buffer' }
-		}
-	    })
 	end
     }
 }