Browse Source

lotsa fixes

Chris 4 years ago
parent
commit
7d99055333
6 changed files with 15 additions and 2 deletions
  1. 2 0
      README.md
  2. 1 0
      init.lua
  3. 2 1
      lua/colorscheme.lua
  4. 7 0
      lua/config.lua
  5. 3 0
      lua/lsp/js-ts-ls.lua
  6. 0 1
      lua/nv-utils/init.lua

+ 2 - 0
README.md

@@ -183,6 +183,8 @@ features when I have time
 - maybe incorporate ultisnips
 - switch back to `nvim-autopairs` when/if it doesn't break snippets 
 - Implement this for typescript https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils
+- look into tabnine
+
 
 **PLUGIN BUGS**
 

+ 1 - 0
init.lua

@@ -58,3 +58,4 @@ require('lsp.html-ls')
 require('lsp.efm-general-ls')
 require('lsp.virtual_text')
 
+-- vim.lsp.handlers["textDocument/publishDiagnostics"] = nil

+ 2 - 1
lua/colorscheme.lua

@@ -1,2 +1,3 @@
-vim.cmd('colorscheme nvcode')
 vim.cmd('let g:nvcode_termcolors=256')
+
+vim.cmd('colorscheme '..COLORSCHEME)

+ 7 - 0
lua/config.lua

@@ -2,13 +2,20 @@ AUTO_COMPLETE=true
 -- make list of languages
 AUTO_FORMAT=true
 
+COLORSCHEME='nvcode'
+
 -- ideas
 
 --[[
 
+nv.lint.python='flake8'
 nv.format.python='black'
 nv.format.python='yapf'
 nv.format.python='autopep8'
+nv.format.tsserver='prettier'
+nv.format.tsserver='eslint'
 
 
 ]]
+
+

+ 3 - 0
lua/lsp/js-ts-ls.lua

@@ -7,10 +7,13 @@
 -- require'completion'.on_attach(client)
 -- require'illuminate'.on_attach(client)
 -- end
+
 require'lspconfig'.tsserver.setup {
     cmd = {DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server", "--stdio"},
+    filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" },
     on_attach = require'lsp'.tsserver_on_attach,
     -- This makes sure tsserver is not used for formatting (I prefer prettier)
     -- on_attach = require'lsp'.common_on_attach,
+    root_dir = require('lspconfig/util').root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"),
     settings = {documentFormatting = false}
 }

+ 0 - 1
lua/nv-utils/init.lua

@@ -30,7 +30,6 @@ nv_utils.define_augroups({
         {'BufNewFile', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
         {'FileType', 'java', 'luafile ~/.config/nvim/lua/lsp/java-ls.lua'},
         {'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'},
-        {'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'},
         {'FileType', 'markdown', 'setlocal wrap'}, {'FileType', 'markdown', 'setlocal spell'},
         {'BufWinEnter', '.sol', 'setlocal filetype=solidity'},