From 4f1d414d9c04e611e60f1af5e69f2347a17bc6ce Mon Sep 17 00:00:00 2001 From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:40:16 -0400 Subject: [PATCH] switch to tree-sitter-ron (#8624) --- languages.toml | 5 +++- runtime/queries/ron/highlights.scm | 44 +++++++++++++++++++++++++++++- runtime/queries/ron/indents.scm | 13 ++++++++- runtime/queries/ron/injections.scm | 3 +- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/languages.toml b/languages.toml index d8207b3ed..8b9b01e9c 100644 --- a/languages.toml +++ b/languages.toml @@ -1689,7 +1689,10 @@ file-types = ["ron"] roots = [] comment-token = "//" indent = { tab-width = 4, unit = " " } -grammar = "rust" + +[[grammar]] +name = "ron" +source = { git = "https://github.com/zee-editor/tree-sitter-ron", rev = "7762d709a0f7c1f9e269d0125a2e8a7a69006146" } [[language]] name = "robot" diff --git a/runtime/queries/ron/highlights.scm b/runtime/queries/ron/highlights.scm index 43766a4f8..1061d559a 100644 --- a/runtime/queries/ron/highlights.scm +++ b/runtime/queries/ron/highlights.scm @@ -1 +1,43 @@ -; inherits: rust \ No newline at end of file +; Literals +;------------ + +(string) @string +(boolean) @constant.builtin.boolean +(integer) @constant.numeric.integer +(float) @constant.numeric.float +(char) @constant.character + +; Structs +;------------ + +(enum_variant) @type.enum.variant +(struct_entry (_) @variable.other.member ":") +(struct_name (identifier)) @type + + + + +; Comments +;------------ + +(line_comment) @comment.line +(block_comment) @comment.block + + +; Punctuation +;------------ + +"," @punctuation.delimiter +":" @punctuation.delimiter + +"(" @punctuation.bracket +")" @punctuation.bracket +"[" @punctuation.bracket +"]" @punctuation.bracket +"{" @punctuation.bracket +"}" @punctuation.bracket + + +; Special +;------------ +(escape_sequence) @constant.character.escape diff --git a/runtime/queries/ron/indents.scm b/runtime/queries/ron/indents.scm index 43766a4f8..e73bf9224 100644 --- a/runtime/queries/ron/indents.scm +++ b/runtime/queries/ron/indents.scm @@ -1 +1,12 @@ -; inherits: rust \ No newline at end of file +[ + (array) + (map) + (tuple) + (struct) +] @indent + +[ + "}" + "]" + ")" +] @outdent diff --git a/runtime/queries/ron/injections.scm b/runtime/queries/ron/injections.scm index 43766a4f8..e4509a5fd 100644 --- a/runtime/queries/ron/injections.scm +++ b/runtime/queries/ron/injections.scm @@ -1 +1,2 @@ -; inherits: rust \ No newline at end of file +([(line_comment) (block_comment)] @injection.content + (#set! injection.language "comment"))