From c194acbfc479d8e5839fa629363f93f6550d035c Mon Sep 17 00:00:00 2001 From: Stephan Seitz Date: Sat, 29 Apr 2023 18:22:26 +0200 Subject: feat(treesitter): add query_linter from nvim-treesitter/playground (#22784) Co-authored-by: clason Co-authored-by: lewis6991 --- runtime/ftplugin/query.lua | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'runtime/ftplugin/query.lua') diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua index 3b99d67247..842d338fd9 100644 --- a/runtime/ftplugin/query.lua +++ b/runtime/ftplugin/query.lua @@ -1,6 +1,30 @@ -- Neovim filetype plugin file -- Language: Tree-sitter query --- Last Change: 2022 Mar 29 +-- Last Change: 2022 Apr 25 + +if vim.b.did_ftplugin == 1 then + return +end + +-- Do not set vim.b.did_ftplugin = 1 to allow loading of ftplugin/lisp.vim + +-- use treesitter over syntax +vim.treesitter.start() + +-- query linter +local buf = vim.api.nvim_get_current_buf() +local query_lint_on = vim.g.query_lint_on or { 'BufEnter', 'BufWrite' } + +if not vim.b.disable_query_linter and #query_lint_on > 0 then + vim.api.nvim_create_autocmd(query_lint_on, { + group = vim.api.nvim_create_augroup('querylint', { clear = false }), + buffer = buf, + callback = function() + vim.treesitter.query.lint(buf) + end, + desc = 'Query linter', + }) +end -- it's a lisp! vim.cmd([[ runtime! ftplugin/lisp.vim ]]) -- cgit From 668f16bac779ac52d7bd9452e6001a7a6d1e9965 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sun, 30 Apr 2023 11:01:54 +0200 Subject: feat(treesitter): upstream query omnifunc from playground (#23394) and set by default in `ftplugin/query.lua` --- runtime/ftplugin/query.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime/ftplugin/query.lua') diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua index 842d338fd9..accf38c199 100644 --- a/runtime/ftplugin/query.lua +++ b/runtime/ftplugin/query.lua @@ -11,6 +11,9 @@ end -- use treesitter over syntax vim.treesitter.start() +-- set omnifunc +vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc' + -- query linter local buf = vim.api.nvim_get_current_buf() local query_lint_on = vim.g.query_lint_on or { 'BufEnter', 'BufWrite' } -- cgit From 5d8ab32f3871b0232972cac1116ac7cba98389e5 Mon Sep 17 00:00:00 2001 From: Maria José Solano Date: Fri, 25 Aug 2023 11:17:36 -0700 Subject: feat(treesitter): add a query editor (#24703) --- runtime/ftplugin/query.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'runtime/ftplugin/query.lua') diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua index accf38c199..964c221ad4 100644 --- a/runtime/ftplugin/query.lua +++ b/runtime/ftplugin/query.lua @@ -1,6 +1,6 @@ -- Neovim filetype plugin file -- Language: Tree-sitter query --- Last Change: 2022 Apr 25 +-- Last Change: 2023 Aug 23 if vim.b.did_ftplugin == 1 then return @@ -14,6 +14,8 @@ vim.treesitter.start() -- set omnifunc vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc' +vim.opt_local.iskeyword:append('.') + -- query linter local buf = vim.api.nvim_get_current_buf() local query_lint_on = vim.g.query_lint_on or { 'BufEnter', 'BufWrite' } -- cgit