From 9d2cb6f9a3a2f64de2d5613e1701883d21d6103c Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Tue, 5 May 2026 22:53:09 +0200 Subject: [PATCH] improved ts --- init.lua | 4 ++-- lazy-lock.json | 32 ++++++++++++++++---------------- lua/plugins/lsp.lua | 3 +++ lua/plugins/telescope.lua | 3 +++ lua/plugins/ts.lua | 15 +++++++++++++++ 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/init.lua b/init.lua index b318e8f..effc86c 100644 --- a/init.lua +++ b/init.lua @@ -98,8 +98,8 @@ require('lazy').setup({ transparent = (vim.fn.has_key(vim.fn.environ(), 'WSL_DISTRO_NAME') == 0), terminal_colors = false, ---@param highlights tokyonight.Highlights - ---@param colors ColorScheme - on_highlights = function(highlights, colors) + ---@param _ ColorScheme + on_highlights = function(highlights, _) highlights.TabLineSel = { bg = '#252d37' } end, }) diff --git a/lazy-lock.json b/lazy-lock.json index 2bbecdf..1600ede 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,42 +4,42 @@ "blame.nvim": { "branch": "main", "commit": "179da7aaacce7c52874af636255ede72dd6fe796" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" }, - "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, + "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" }, "cspell.nvim": { "branch": "main", "commit": "5feecef8d109f5460c576596aba44a6253127aa4" }, "fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, - "gitsigns.nvim": { "branch": "main", "commit": "8d82c240f190fc33723d48c308ccc1ed8baad69d" }, - "grug-far.nvim": { "branch": "main", "commit": "21604255d0e8f9968322f61f2b6c09e5efe1285a" }, + "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, + "grug-far.nvim": { "branch": "main", "commit": "21790e59dd0109a92a70cb874dd002af186314f5" }, "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "leetcode.nvim": { "branch": "master", "commit": "fdd3f91800b3983e27bc9fcfb99cfa7293d7f11a" }, - "markview.nvim": { "branch": "main", "commit": "e27dee8b2a61f89ac3a06deae0264ad1d3f7b62c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" }, + "leetcode.nvim": { "branch": "master", "commit": "4e8b3683940a8377379ce9398e7f329e3560b42c" }, + "markview.nvim": { "branch": "main", "commit": "8b82823bbe7b452c5920ab22947e186c6cb067b4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, - "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" }, + "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" }, "mini.pairs": { "branch": "main", "commit": "42387c7fe68fc0b6e95eaf37f1bb76e7bffaa0d9" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "main", "commit": "4d0828d95adaf4250c1373d2cd9318d3509712b7" }, - "neotest": { "branch": "master", "commit": "fd0b7986dd0ae04e38ec7dc0c78a432e3820839c" }, + "neo-tree.nvim": { "branch": "main", "commit": "19d20a99bf0061a5ecc4343d2f09fa713306c965" }, + "neotest": { "branch": "master", "commit": "ad991822b7076b1d940b33a9d6d0d30416d5df81" }, "neotest-bun": { "branch": "main", "commit": "af0f8684cd00a96f1e0359f1aeff2b9bf7a0ec88" }, "neotest-jest": { "branch": "main", "commit": "0e7979d51301dfae5ef839d771bd28cf593fde3f" }, - "none-ls.nvim": { "branch": "main", "commit": "899e93f9f10251d7220b188eba1b837c0ba27927" }, + "none-ls.nvim": { "branch": "main", "commit": "241ff8214b4ec051eb51e74a61ff729c0271b429" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lspconfig": { "branch": "master", "commit": "4b7fbaa239c5db6b36f424a4521ca9f1a401be33" }, + "nvim-lspconfig": { "branch": "master", "commit": "31026a13eefb20681124706a79fc1df6bf11ab27" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, - "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, + "nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "roslyn.nvim": { "branch": "main", "commit": "6a5e60a7c25d9ce0835aa9c69379f1c92e0a9d56" }, - "schemastore.nvim": { "branch": "main", "commit": "250aed7415ddd6cb3ea321490c7b35094ed9148d" }, + "roslyn.nvim": { "branch": "main", "commit": "b62d1a588765f0aa1b46ed260252c9e456408835" }, + "schemastore.nvim": { "branch": "main", "commit": "6db1246640e9e1bdf8a1d1f6d27a940fc0a572d5" }, "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "471eebb1037899fd942cc0f52c012f8773505da1" }, + "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" }, "template-string.nvim": { "branch": "main", "commit": "d3a26d3c449a97c44891a31736a101b60b64cf2b" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, - "tree-sitter-manager.nvim": { "branch": "main", "commit": "fa63bc63ae08b661843d9976a43becfbd3daf76c" }, + "tree-sitter-manager.nvim": { "branch": "main", "commit": "33a94d022e3a5a500d878b784ba7fec61559c70a" }, "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" } } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index df943d0..a8ade0f 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -66,6 +66,9 @@ return { -- -- When you move your cursor, the highlights will be cleared (the second autocommand). local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client.name == 'roslyn' then + client.server_capabilities.semanticTokensProvider = nil + end if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 7b4e607..4273c8f 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -30,6 +30,9 @@ return { -- Fuzzy Finder (files, lsp, etc) }, }, defaults = { + preview = { + treesitter = true, + }, mappings = { i = { [''] = actions.select_horizontal, diff --git a/lua/plugins/ts.lua b/lua/plugins/ts.lua index 1d6765d..89b66b6 100644 --- a/lua/plugins/ts.lua +++ b/lua/plugins/ts.lua @@ -43,6 +43,7 @@ return { 'xml', 'yaml', 'zig', + 'fsharp', }, -- Default Options -- ensure_installed = {}, -- list of parsers to install at the start of a neovim session @@ -53,5 +54,19 @@ return { -- parser_dir = vim.fn.stdpath("data") .. "/site/parser", -- query_dir = vim.fn.stdpath("data") .. "/site/queries", }) + + -- tree-sitter-manager uses parser names as FileType patterns, but some Vim + -- filetypes differ from the treesitter parser name and need manual wiring. + local mismatches = { + { lang = 'c_sharp', ft = 'cs' }, + { lang = 'fsharp', ft = 'fsharp' }, + } + for _, m in ipairs(mismatches) do + vim.treesitter.language.register(m.lang, m.ft) + vim.api.nvim_create_autocmd('FileType', { + pattern = m.ft, + callback = function() vim.treesitter.start() end, + }) + end end, }