- cleared up some comments and commented out code
- ignored MiniStatusLine diagnostic
This commit is contained in:
7
.luarc.json
Normal file
7
.luarc.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"diagnostics.globals": [
|
||||
"vim",
|
||||
"require",
|
||||
"MiniStatusline"
|
||||
]
|
||||
}
|
@@ -111,44 +111,6 @@ return { -- LSP Configuration & Plugins
|
||||
},
|
||||
}
|
||||
})
|
||||
-- local vue_path = vim.fn.stdpath("data") ..
|
||||
-- "/mason/packages/vue-language-server/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin"
|
||||
-- vim.lsp.config('ts_ls', {
|
||||
-- init_options = {
|
||||
-- plugins = {
|
||||
-- {
|
||||
-- name = "@vue/typescript-plugin",
|
||||
-- -- location = vim.fn.stdpath("data") .. "/erikcustom/language-tools/packages/typescript-plugin",
|
||||
-- -- /mason/packages/vue-language-server/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin
|
||||
-- location = vue_path,
|
||||
-- languages = { "javascript", "typescript", "vue" },
|
||||
-- },
|
||||
-- },
|
||||
-- settings = {
|
||||
-- typescript = {
|
||||
-- tsserver = {
|
||||
-- useSyntaxServer = false,
|
||||
-- },
|
||||
-- inlayHints = {
|
||||
-- includeInlayParameterNameHints = 'all',
|
||||
-- includeInlayParameterNameHintsWhenArgumentMatchesName = true,
|
||||
-- includeInlayFunctionParameterTypeHints = true,
|
||||
-- includeInlayVariableTypeHints = true,
|
||||
-- includeInlayVariableTypeHintsWhenTypeMatchesName = true,
|
||||
-- includeInlayPropertyDeclarationTypeHints = true,
|
||||
-- includeInlayFunctionLikeReturnTypeHints = true,
|
||||
-- includeInlayEnumMemberValueHints = true,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
--
|
||||
-- },
|
||||
-- filetypes = {
|
||||
-- "javascript",
|
||||
-- "typescript",
|
||||
-- "vue",
|
||||
-- },
|
||||
-- })
|
||||
local vue_language_server_path = vim.fn.expand '$MASON/packages' ..
|
||||
'/vue-language-server' .. '/node_modules/@vue/language-server'
|
||||
|
||||
@@ -211,8 +173,5 @@ return { -- LSP Configuration & Plugins
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
-- local vue_path = vim.fn.stdpath("data") ..
|
||||
-- "/mason/packages/vue-language-server/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin"
|
||||
end,
|
||||
}
|
||||
|
@@ -1,27 +1,14 @@
|
||||
return {
|
||||
"nvim-telescope/telescope.nvim", tag = "0.1.8",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
tag = "0.1.8",
|
||||
dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
|
||||
opts = function()
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', "<leader>ff", builtin.find_files, {desc = "[F]ind [F]iles"})
|
||||
vim.keymap.set('n', "<leader>fg", builtin.live_grep, {desc = "[F]ind [G]rep"})
|
||||
vim.keymap.set('n', "<leader>fb", builtin.buffers, {desc = "[F]ind [B]uffers"})
|
||||
vim.keymap.set('n', "<leader>fh", builtin.help_tags, {desc = "[F]ind [H]elp"})
|
||||
vim.keymap.set('n', "<leader>fd", builtin.diagnostics, {desc = "[F]ind [D]iagnostics"})
|
||||
vim.keymap.set('n', "<leader>fo", builtin.resume, {desc = "[F]ind [O]Resume"})
|
||||
vim.keymap.set('n', "<leader>ff", builtin.find_files, { desc = "[F]ind [F]iles" })
|
||||
vim.keymap.set('n', "<leader>fg", builtin.live_grep, { desc = "[F]ind [G]rep" })
|
||||
vim.keymap.set('n', "<leader>fb", builtin.buffers, { desc = "[F]ind [B]uffers" })
|
||||
vim.keymap.set('n', "<leader>fh", builtin.help_tags, { desc = "[F]ind [H]elp" })
|
||||
vim.keymap.set('n', "<leader>fd", builtin.diagnostics, { desc = "[F]ind [D]iagnostics" })
|
||||
vim.keymap.set('n', "<leader>fo", builtin.resume, { desc = "[F]ind [O]Resume" })
|
||||
end,
|
||||
|
||||
-- keys = {
|
||||
-- { "<leader>ff", require("telescope.builtin").find_files, desc = "[F]ind [F]iles" },
|
||||
-- { "<leader>fg", require("telescope.builtin").live_grep, desc = "[F]ind [G]rep" },
|
||||
-- { "<leader>fb", require("telescope.builtin").buffers, desc = "[F]ind [B]uffers" },
|
||||
-- { "<leader>fh", require("telescope.builtin").help_tags, desc = "[F]ind [H]elp" },
|
||||
-- { "<leader>fd", require("telescope.builtin").diagnostics, desc = "[F]ind [D]iagnostics" },
|
||||
-- { "<leader>fo", require("telescope.builtin").resume, desc = "[F]ind [O]Resume" },
|
||||
-- {
|
||||
-- "<leader>fp",
|
||||
-- function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
|
||||
-- desc = "[F]ind [P]lugin file",
|
||||
-- },
|
||||
-- },
|
||||
}
|
||||
|
@@ -62,7 +62,7 @@ vim.diagnostic.config({
|
||||
})
|
||||
|
||||
if vim.g.vscode then
|
||||
|
||||
-- put vscode specific settings / keymaps here
|
||||
else
|
||||
-- Keymaps
|
||||
-- Copy
|
||||
|
18
lua/vue.lua
18
lua/vue.lua
@@ -1,18 +0,0 @@
|
||||
local langtoolpath = vim.fn.stdpath("data") .. "/erikcustom/language-tools"
|
||||
if not vim.uv.fs_stat(langtoolpath) then
|
||||
local langtoolrepo = "https://github.com/vuejs/language-tools"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=master", langtoolrepo, langtoolpath })
|
||||
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone language-tools:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user