From 5f50a2edca87646d919ed2ce9a2c87e3e32673f5 Mon Sep 17 00:00:00 2001 From: 2ndbeam <2ndbeam@disroot.org> Date: Mon, 10 Aug 2026 13:44:54 +0300 Subject: [PATCH] slint_lsp + treesitter for haxe + moved to lua ftplugins --- ftplugin/dart.lua | 2 ++ ftplugin/dart.vim | 2 -- ftplugin/lua.lua | 2 ++ ftplugin/lua.vim | 2 -- lazy-lock.json | 8 +++++--- lua/lsp/slint_lsp.lua | 1 + lua/plugins/haxe.lua | 4 ++++ lua/plugins/treesitter.lua | 34 ++++++++++++++++++++++++++++++++++ 8 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 ftplugin/dart.lua delete mode 100644 ftplugin/dart.vim create mode 100644 ftplugin/lua.lua delete mode 100644 ftplugin/lua.vim create mode 100644 lua/lsp/slint_lsp.lua create mode 100644 lua/plugins/haxe.lua create mode 100644 lua/plugins/treesitter.lua diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua new file mode 100644 index 0000000..9e469a1 --- /dev/null +++ b/ftplugin/dart.lua @@ -0,0 +1,2 @@ +vim.opt_local.tabstop = 2 +vim.opt_local.shiftwidth = 2 diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim deleted file mode 100644 index 884dc4c..0000000 --- a/ftplugin/dart.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal tabstop=2 -setlocal shiftwidth=2 diff --git a/ftplugin/lua.lua b/ftplugin/lua.lua new file mode 100644 index 0000000..9e469a1 --- /dev/null +++ b/ftplugin/lua.lua @@ -0,0 +1,2 @@ +vim.opt_local.tabstop = 2 +vim.opt_local.shiftwidth = 2 diff --git a/ftplugin/lua.vim b/ftplugin/lua.vim deleted file mode 100644 index 884dc4c..0000000 --- a/ftplugin/lua.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal tabstop=2 -setlocal shiftwidth=2 diff --git a/lazy-lock.json b/lazy-lock.json index 954d49d..7244108 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,13 +3,15 @@ "bevy_inspector.nvim": { "branch": "master", "commit": "debdf31e5f4b862447ecbf4a9ebfc61b5a9d0772" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "haxe-lsp.nvim": { "branch": "main", "commit": "afd806526ca480f9edb8f7046e15851d96347654" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, - "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, + "nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" }, "nvim-gdb": { "branch": "master", "commit": "67abac716b626ece57f3a7c72121542f0b3edfe9" }, - "nvim-lspconfig": { "branch": "master", "commit": "d224a1920728ba129880efc700d4a0180ac4ecbb" }, - "nvim-web-devicons": { "branch": "master", "commit": "dad71387de386a946b123079d0e53f23028f3abd" }, + "nvim-lspconfig": { "branch": "master", "commit": "43ed3797b266e1ee8d222e491379ad471c9d3146" }, + "nvim-treesitter": { "branch": "main", "commit": "c9f9ed6c1892f629ea399f4ee7905f2686fa13f2" }, + "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" }, "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" }, diff --git a/lua/lsp/slint_lsp.lua b/lua/lsp/slint_lsp.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/slint_lsp.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/plugins/haxe.lua b/lua/plugins/haxe.lua new file mode 100644 index 0000000..1681f06 --- /dev/null +++ b/lua/plugins/haxe.lua @@ -0,0 +1,4 @@ +return { + "https://codeberg.org/jurmerlo/haxe-lsp.nvim", + opts = { run_on_open = true }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..bbfea6d --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,34 @@ +return { + 'nvim-treesitter/nvim-treesitter', + lazy = false, + build = ':TSUpdate', + config = function() + vim.api.nvim_create_autocmd("User", { + pattern = "TSUpdate", + callback = function() + local parsers = require 'nvim-treesitter.parsers' + parsers.haxe = { + install_info = { + url = "https://github.com/vantreeseba/tree-sitter-haxe", + branch = "main", + queries = "queries", + revision = "a25faf5efa842502a326ec803cfbe5a442a11e7c", + }, + tier = 0, + } + end, + }) + + vim.filetype.add({ extension = { hx = "haxe" } }) + + vim.api.nvim_create_autocmd("FileType", { + pattern = "haxe", + callback = function() + local language = vim.treesitter.language.get_lang("haxe") + if language and vim.treesitter.language.add(language) then + vim.treesitter.start() + end + end, + }) + end, +}