From 17e77749c1f14f7e2bbae8c92c1b1cad1c2f26a9 Mon Sep 17 00:00:00 2001 From: Mark McCulloh Date: Mon, 13 Nov 2023 14:04:27 -0500 Subject: [PATCH] fix(wing): update parser and queries, add maintainer (#5671) --- lockfile.json | 2 +- lua/nvim-treesitter/parsers.lua | 2 +- queries/wing/folds.scm | 1 - queries/wing/highlights.scm | 3 --- tests/query/highlights/wing/class.w | 4 ++-- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lockfile.json b/lockfile.json index 81a814f17..04b0b5592 100644 --- a/lockfile.json +++ b/lockfile.json @@ -696,7 +696,7 @@ "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b" }, "wing": { - "revision": "238200d172538d5ff1228a929ea543465acfc410" + "revision": "d6af9180bfbd82b01980e7e5307d77ed3939e2a7" }, "xcompose": { "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5" diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index 40491c7ff..9bd3521ef 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -2042,7 +2042,7 @@ list.wing = { location = "libs/tree-sitter-wing", requires_generate_from_grammar = true, }, - maintainers = { "@gshpychka" }, + maintainers = { "@gshpychka", "@MarkMcCulloh" }, experimental = true, } diff --git a/queries/wing/folds.scm b/queries/wing/folds.scm index 538367db3..60de6116d 100644 --- a/queries/wing/folds.scm +++ b/queries/wing/folds.scm @@ -12,5 +12,4 @@ (enum_definition) (try_catch_statement) (method_definition) - (inflight_method_definition) ] @fold diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm index 0e8bd6492..af5ef6ed6 100644 --- a/queries/wing/highlights.scm +++ b/queries/wing/highlights.scm @@ -11,8 +11,6 @@ name: (identifier) @type) (method_definition name: (identifier) @method) -(inflight_method_definition - name: (identifier) @method) ; Functions @@ -78,7 +76,6 @@ "for" "if" "in" - "init" "let" "new" "return" diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w index 636cbc601..06160d741 100644 --- a/tests/query/highlights/wing/class.w +++ b/tests/query/highlights/wing/class.w @@ -9,9 +9,9 @@ class Foo { //^ field // ^ type.builtin // ^ punctuation.delimiter - init(name: str) { + new(name: str) { //^ keyword -// ^ variable +// ^ variable this.name = name; // ^ punctuation.delimiter // ^ operator