Skip to content

Commit

Permalink
fix: broken ts server
Browse files Browse the repository at this point in the history
  • Loading branch information
fbosch committed Nov 26, 2024
1 parent 33fa721 commit ce879a8
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 4 deletions.
20 changes: 20 additions & 0 deletions .config/nvim/lua/plugins/editor/base.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,24 @@ return {
},
},
},
{
"chrisgrieser/nvim-spider",
keys = {
{
"w",
"<cmd>lua require('spider').motion('w')<CR>",
mode = { "n", "o", "x" },
},
{
"e",
"<cmd>lua require('spider').motion('e')<CR>",
mode = { "n", "o", "x" },
},
{
"b",
"<cmd>lua require('spider').motion('b')<CR>",
mode = { "n", "o", "x" },
},
},
},
}
20 changes: 16 additions & 4 deletions .config/nvim/lua/plugins/editor/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ return {
},
"williamboman/mason-lspconfig.nvim",
"WhoIsSethDaniel/mason-tool-installer.nvim",
{ "yioneko/nvim-vtsls", ft = { "typescript", "typescriptreact" } },
{
"pmizio/typescript-tools.nvim",
dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
opts = {},
},
{ "yioneko/nvim-vtsls", ft = { "typescript", "typescriptreact" }, enabled = false },
{ "folke/neodev.nvim", ft = { "lua" }, opts = {} },
},
keys = {
Expand All @@ -145,8 +150,14 @@ return {

local lspconfig = require("lspconfig")

local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = vim.tbl_deep_extend("force", capabilities, require("cmp_nvim_lsp").default_capabilities())
local capabilities = vim.tbl_deep_extend("force", vim.lsp.protocol.make_client_capabilities(), {
workspace = {
didChangeWatchedFiles = {
dynamicRegistration = false,
},
},
})
capabilities = vim.tbl_deep_extend("force", require("cmp_nvim_lsp").default_capabilities(), capabilities)
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true,
Expand Down Expand Up @@ -174,6 +185,7 @@ return {
marksman = {},
dockerls = {},
vtsls = {
enabled = false,
filetypes = {
"javascript",
"javascriptreact",
Expand All @@ -184,7 +196,7 @@ return {
},
},
tsserver = {
enabled = false,
enabled = true,
},
ts_ls = {
enabled = false,
Expand Down
14 changes: 14 additions & 0 deletions .config/nvim/spell/en.utf-8.add
Original file line number Diff line number Diff line change
Expand Up @@ -1276,3 +1276,17 @@ waitFor
toHaveBeenCalled
bg-neutral-5
bg-inherit
eventDescription
PDFs
loaderData
Beregningstype
preloaded
preloadModules
onConfirm
loanPurpose
KKfast
KKvar
setprojectannotations
portable-stories
portable-stories-vitest
Leasingportalen
Binary file modified .config/nvim/spell/en.utf-8.add.spl
Binary file not shown.

0 comments on commit ce879a8

Please sign in to comment.