From fe24e954d1e7b936cb55ee63941f53f7b2379ade Mon Sep 17 00:00:00 2001 From: Uzair Aftab <48220549+Uzaaft@users.noreply.github.com> Date: Sun, 10 Dec 2023 21:12:04 +0100 Subject: [PATCH] fix(xbase): Remove lsp, and treesitter logic from xbase, instead pointing to swift pack (#679) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(xbase): Remove lsp logic from xbase, instead pointing to swift pack Co-authored-by: Kai Löhnert --- .../programming-language-support/xbase/README.md | 8 ++++++++ .../programming-language-support/xbase/init.lua | 16 ---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lua/astrocommunity/programming-language-support/xbase/README.md b/lua/astrocommunity/programming-language-support/xbase/README.md index 31c9003ed..ed1818ea1 100644 --- a/lua/astrocommunity/programming-language-support/xbase/README.md +++ b/lua/astrocommunity/programming-language-support/xbase/README.md @@ -5,6 +5,14 @@ xbase is a WIP plugin, and the experience provided by this plugin might be lackluster. +## Tip + +You should also include the swift pack for basic language support. To add it into your setup, add: +```lua + ... + {import ="astrocommunity.pack.swift"} +``` + ## Requirements 1. Make sure you have [sourcekit-lsp](https://github.com/apple/sourcekit-lsp) diff --git a/lua/astrocommunity/programming-language-support/xbase/init.lua b/lua/astrocommunity/programming-language-support/xbase/init.lua index fe8af30b4..a425de8f3 100644 --- a/lua/astrocommunity/programming-language-support/xbase/init.lua +++ b/lua/astrocommunity/programming-language-support/xbase/init.lua @@ -1,28 +1,12 @@ -local utils = require "astronvim.utils" - return { { "xbase-lab/xbase", ft = { "swift", "objcpp", "objc" }, run = "make install", dependencies = { - "neovim/nvim-lspconfig", { "nvim-telescope/telescope.nvim", optional = true }, { "nvim-lua/plenary.nvim", optional = true }, { "stevearc/dressing.nvim", optional = true }, -- (in case you don't use telescope but something else) }, - init = function() require("astronvim.utils.lsp").setup "sourcekit" end, - }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if opts.ensure_installed ~= "all" then - opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "swift") - end - end, - }, - { - "jay-babu/mason-nvim-dap.nvim", - opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "codelldb") end, }, }