From 40e8c92f99ef26625ff2206f5e183ac3109f20ba Mon Sep 17 00:00:00 2001 From: Mark McCulloh Date: Sun, 14 Apr 2024 11:53:37 -0400 Subject: [PATCH] fix(wing): update to new repo (#6446) --- README.md | 2 +- lockfile.json | 2 +- lua/nvim-treesitter/parsers.lua | 5 +---- queries/wing/highlights.scm | 6 ++++++ tests/query/highlights/wing/class.w | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cd3370d34..52540cafe 100644 --- a/README.md +++ b/README.md @@ -437,7 +437,7 @@ We are looking for maintainers to add more parsers and to write query files for - [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo, @lucario387) - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok) - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta) -- [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh) +- [x] [wing](https://github.com/winglang/tree-sitter-wing) (maintained by @gshpychka, @MarkMcCulloh) - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime) - [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime) - [x] [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) (maintained by @amaanq) diff --git a/lockfile.json b/lockfile.json index 196b2582c..cbe90080c 100644 --- a/lockfile.json +++ b/lockfile.json @@ -792,7 +792,7 @@ "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d" }, "wing": { - "revision": "65d7da7211ef5d40d22aa9dcfb59aa7a757fcdeb" + "revision": "5b6c2a5818a602557778d1bfc265d016cafa0712" }, "xcompose": { "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1" diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index e7761e2b4..9f1cb76c3 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -2297,13 +2297,10 @@ list.wgsl_bevy = { list.wing = { install_info = { - url = "https://github.com/winglang/wing", + url = "https://github.com/winglang/tree-sitter-wing", files = { "src/parser.c", "src/scanner.c" }, - location = "libs/tree-sitter-wing", - requires_generate_from_grammar = true, }, maintainers = { "@gshpychka", "@MarkMcCulloh" }, - experimental = true, } list.xcompose = { diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm index e33829b81..0171e09de 100644 --- a/queries/wing/highlights.scm +++ b/queries/wing/highlights.scm @@ -95,4 +95,10 @@ "else" ] @keyword.conditional +[ + "pub" + "protected" + "internal" +] @keyword.modifier + "return" @keyword.return diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w index c210fc611..602b2f749 100644 --- a/tests/query/highlights/wing/class.w +++ b/tests/query/highlights/wing/class.w @@ -3,7 +3,7 @@ bring cloud; class Foo { // <- @keyword -// ^ @variable +// ^ @type // ^ @punctuation.bracket name: str; //^ @variable.member