diff --git a/.eslintrc.json b/.eslintrc.json index 2940231..36f8935 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,18 +1,19 @@ { - "env": { - "browser": true, - "es2021": true, - "node": true - }, - "extends": "standard-with-typescript", - "parserOptions": { - "ecmaVersion": "latest", - "sourceType": "module" - }, - "rules": { - "indent": ["error", 4], - "semi": ["error", "always"], - "quotes": ["error", "double"], - "comma-dangle": ["error", "only-multiline"] - } + "env": { + "browser": true, + "es2021": true, + "node": true + }, + "extends": "standard-with-typescript", + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "rules": { + "indent": ["error", 4], + "semi": ["error", "always"], + "quotes": ["error", "double"], + "comma-dangle": ["error", "only-multiline"], + "space-before-function-paren": ["error", "never"] + } } diff --git a/.prettierrc.json b/.prettierrc.json index d708abb..97cf44a 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,6 +1,7 @@ { - "trailingComma": "es5", - "tabWidth": 4, - "semi": true, - "singleQuote": false + "trailingComma": "es5", + "tabWidth": 4, + "semi": true, + "singleQuote": false, + "spaceBeforeFunctionParen": false } diff --git a/init.lua b/init.lua index 42c41cb..98d2b3c 100644 --- a/init.lua +++ b/init.lua @@ -158,15 +158,38 @@ local lsp_zero = require("lsp-zero") lsp_zero.on_attach(function(client, bufnr) lsp_zero.default_keymaps({ buffer = bufnr }) end) -require("lspconfig").pyright.setup({ + +lspconfig = require("lspconfig") + +lspconfig.pyright.setup({ virtual_text = false, }) local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) -require("lspconfig").clangd.setup({ +lspconfig.clangd.setup({ capabilities = capabilities, }) + +local configs = require("lspconfig.configs") +if not configs.jinja_lsp then + configs.jinja_lsp = { + default_config = { + cmd = { "/Users/zev/.cargo/bin/jinja-lsp" }, + filetypes = { "jinja", "rs" }, + root_dir = function(fname) + return lspconfig.util.find_git_ancestor(fname) + end, + settings = { + templates = "./templates", + backend = { "./app" }, + lang = "rust", + }, + }, + } +end + +lspconfig.jinja_lsp.setup({}) vim.api.nvim_create_augroup("AutoFormat", {}) vim.api.nvim_create_autocmd("BufWritePost", {