udpates

3 files changed, 34 insertions, 5 deletions

diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua
index 2355be7c..833d6c20 100644
--- a/lua/lsp/js-ts-ls.lua
+++ b/lua/lsp/js-ts-ls.lua
@@ -3,6 +3,14 @@
 
 -- local capabilities = vim.lsp.protocol.make_client_capabilities()
 -- capabilities.textDocument.completion.completionItem.snippetSupport = true;
+local on_attach_common = function(client)
+    print("LSP Initialized")
+    -- require'completion'.on_attach(client)
+    require'illuminate'.on_attach(client)
+end
+
 require'lspconfig'.tsserver.setup{
-    -- capabilities = capabilities,
+    on_attach = function(client)
+        on_attach_common(client)
+    end,
 }
diff --git a/lua/nv-kommentary/init.lua b/lua/nv-kommentary/init.lua
index dea90f75..a85ea6fe 100644
--- a/lua/nv-kommentary/init.lua
+++ b/lua/nv-kommentary/init.lua
@@ -1,6 +1,19 @@
+-- TODO bring back when kommentary works for React
 vim.g.kommentary_create_default_mappings = false
 vim.api.nvim_set_keymap("n", "<leader>/", "<Plug>kommentary_line_default", {})
 vim.api.nvim_set_keymap("v", "<leader>/", "<Plug>kommentary_visual_default", {})
+
 require('kommentary.config').configure_language("default", {
     prefer_single_line_comments = true,
 })
+
+-- require('kommentary.config').configure_language("python", {
+--     prefer_single_line_comments = true,
+-- })
+
+require('kommentary.config').configure_language("javascriptreact", {
+    prefer_multi_line_comments = true,
+    -- single_line_comment_string = "{/*\\ %s\\ */}",
+    multi_line_comment_strings = {"{/*", "*/}"},
+})
+
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 58360a33..21c43360 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,3 +1,6 @@
+
+vim.cmd [[packadd packer.nvim]]
+
 local execute = vim.api.nvim_command
 local fn = vim.fn
 
@@ -14,7 +17,7 @@ end
 
 return require('packer').startup(function()
   -- Packer can manage itself as an optional plugin
-  use {'wbthomason/packer.nvim'}
+  use {'wbthomason/packer.nvim', opt = true}
 
   -- Information
   use 'nanotee/nvim-lua-guide'
@@ -35,10 +38,12 @@ return require('packer').startup(function()
   -- Autocomplete
   use 'hrsh7th/nvim-compe'
   use 'hrsh7th/vim-vsnip'
-  use 'honza/vim-snippets'
+  use 'hrsh7th/vim-vsnip-integ'
+  -- use 'honza/vim-snippets'
+  -- use 'epilande/vim-react-snippets'
+  -- use 'xabikos/vscode-javascript'
   -- use 'cstrap/python-snippets'
   -- use 'ylcnfrht/vscode-python-snippet-pack'
-  -- use 'xabikos/vscode-javascript'
   -- use 'golang/vscode-go'
   -- use 'rust-lang/vscode-rust'
   -- use 'SirVer/ultisnips'
@@ -89,7 +94,6 @@ return require('packer').startup(function()
   use 'kevinhwang91/nvim-bqf'
   use 'unblevable/quick-scope'
   use 'airblade/vim-rooter'
-  use 'b3nj5m1n/kommentary'
   use 'kevinhwang91/rnvimr'
   use 'mhinz/vim-startify'
   use 'metakirby5/codi.vim'
@@ -106,5 +110,9 @@ return require('packer').startup(function()
   use 'phaazon/hop.nvim'
   use 'liuchengxu/vista.vim'
   use { 'npxbr/glow.nvim', run = ':GlowInstall' }
+  -- figure out how to disable or configure for things with tags like <div></div> because it will highlight all divs
   use 'RRethy/vim-illuminate'
+  -- use 'tpope/vim-commentary'
+  -- use 'suy/vim-context-commentstring'
+  use 'b3nj5m1n/kommentary'
 end)