From ea25ed6431d65265ea44b3438b062ff9e6fa5668 Mon Sep 17 00:00:00 2001 From: Alex Suraci Date: Sun, 18 Sep 2022 13:06:51 -0400 Subject: [PATCH] add `bass` language + highlighting (#3771) --- book/src/generated/lang-support.md | 1 + languages.toml | 14 ++++ runtime/queries/bass/highlights.scm | 101 ++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 runtime/queries/bass/highlights.scm diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index faa2667e..86c26042 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -3,6 +3,7 @@ | astro | ✓ | | | | | awk | ✓ | ✓ | | `awk-language-server` | | bash | ✓ | | | `bash-language-server` | +| bass | ✓ | | | `bass` | | beancount | ✓ | | | | | c | ✓ | ✓ | ✓ | `clangd` | | c-sharp | ✓ | ✓ | | `OmniSharp` | diff --git a/languages.toml b/languages.toml index 1dda58ae..949dd372 100644 --- a/languages.toml +++ b/languages.toml @@ -1767,3 +1767,17 @@ indent = { tab-width = 2, unit = " " } [[grammar]] name = "astro" source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" } + +[[language]] +name = "bass" +scope = "source.bass" +injection-regex = "bass" +file-types = ["bass"] +roots = [] +comment-token = ";" +indent = { tab-width = 2, unit = " " } +language-server = { command = "bass", args = ["--lsp"] } + +[[grammar]] +name = "bass" +source = { git = "https://github.com/vito/tree-sitter-bass", rev = "501133e260d768ed4e1fd7374912ed5c86d6fd90" } diff --git a/runtime/queries/bass/highlights.scm b/runtime/queries/bass/highlights.scm new file mode 100644 index 00000000..f8b70fc1 --- /dev/null +++ b/runtime/queries/bass/highlights.scm @@ -0,0 +1,101 @@ +; GENERATED VIA https://github.com/vito/tree-sitter-bass + +;;; comments + +(comment) @comment.line + +;;; punctuation + +["(" ")" "[" "]" "{" "}"] @punctuation.bracket + +;;; constants + +[(ignore) (null)] @constant.builtin + +(bool) @constant.builtin.boolean + +(int) @constant.numeric.integer + +;;; strings + +;; string literals + +(string) @string +(string (string_escape) @constant.character.escape) + +;; keywords (symbol literals) + +(keyword) @string.special.symbol + +;; paths + +(dot) @string.special.path +(dotdot) @string.special.path +(command) @string.special.path +(subpath (symbol) @string.special.path) + +; slashes in a path denote a combiner call +(subpath (slash) @function) + + + +;;; specific highlighting for builtins & special forms + +;; symbol classification based highlighting + +(list . (symbol) @keyword.control.conditional (#match? @keyword.control.conditional "^(if|case|cond|when)$")) +(cons . (symbol) @keyword.control.conditional (#match? @keyword.control.conditional "^(if|case|cond|when)$")) + +(list . (symbol) @keyword.control.repeat (#match? @keyword.control.repeat "^(each)$")) +(cons . (symbol) @keyword.control.repeat (#match? @keyword.control.repeat "^(each)$")) + +(list . (symbol) @label (#match? @label "^(def|defop|defn)$")) +(cons . (symbol) @label (#match? @label "^(def|defop|defn)$")) + +(list . (symbol) @function.builtin (#match? @function.builtin "^(dump|mkfs|json|log|error|now|cons|wrap|unwrap|eval|make-scope|bind|meta|with-meta|null\\?|ignore\\?|boolean\\?|number\\?|string\\?|symbol\\?|scope\\?|sink\\?|source\\?|list\\?|pair\\?|applicative\\?|operative\\?|combiner\\?|path\\?|empty\\?|thunk\\?|\\+|\\*|quot|-|max|min|=|>|>=|<|<=|list->source|across|emit|next|reduce-kv|assoc|symbol->string|string->symbol|str|substring|trim|scope->list|string->fs-path|string->cmd-path|string->dir|subpath|path-name|path-stem|with-image|with-dir|with-args|with-cmd|with-stdin|with-env|with-insecure|with-label|with-port|with-tls|with-mount|thunk-cmd|thunk-args|resolve|start|addr|wait|read|cache-dir|binds\\?|recall-memo|store-memo|mask|list|list\\*|first|rest|length|second|third|map|map-pairs|foldr|foldl|append|filter|conj|list->scope|merge|apply|id|always|vals|keys|memo|succeeds\\?|run|last|take|take-all|insecure!|from|cd|wrap-cmd|mkfile|path-base|not)$")) +(cons . (symbol) @function.builtin (#match? @function.builtin "^(dump|mkfs|json|log|error|now|cons|wrap|unwrap|eval|make-scope|bind|meta|with-meta|null\\?|ignore\\?|boolean\\?|number\\?|string\\?|symbol\\?|scope\\?|sink\\?|source\\?|list\\?|pair\\?|applicative\\?|operative\\?|combiner\\?|path\\?|empty\\?|thunk\\?|\\+|\\*|quot|-|max|min|=|>|>=|<|<=|list->source|across|emit|next|reduce-kv|assoc|symbol->string|string->symbol|str|substring|trim|scope->list|string->fs-path|string->cmd-path|string->dir|subpath|path-name|path-stem|with-image|with-dir|with-args|with-cmd|with-stdin|with-env|with-insecure|with-label|with-port|with-tls|with-mount|thunk-cmd|thunk-args|resolve|start|addr|wait|read|cache-dir|binds\\?|recall-memo|store-memo|mask|list|list\\*|first|rest|length|second|third|map|map-pairs|foldr|foldl|append|filter|conj|list->scope|merge|apply|id|always|vals|keys|memo|succeeds\\?|run|last|take|take-all|insecure!|from|cd|wrap-cmd|mkfile|path-base|not)$")) + +(list . (symbol) @function.macro (#match? @function.macro "^(op|fn|current-scope|quote|let|provide|module|or|and|->|curryfn|for|\\$|linux)$")) +(cons . (symbol) @function.macro (#match? @function.macro "^(op|fn|current-scope|quote|let|provide|module|or|and|->|curryfn|for|\\$|linux)$")) + +(list . (symbol) @keyword.builtin (#match? @keyword.builtin "^(do|doc)$")) +(cons . (symbol) @keyword.builtin (#match? @keyword.builtin "^(do|doc)$")) + +(list . (symbol) @keyword.control.import (#match? @keyword.control.import "^(use|import|load)$")) +(cons . (symbol) @keyword.control.import (#match? @keyword.control.import "^(use|import|load)$")) + + +;; special cases + +; [a & b] highlights & as operator rather than a regular symbol +(list (symbol) @operator (#match? @operator "&")) +(cons (symbol) @operator (#match? @operator "&")) + +; (-> x y z) highlights first x as var, y z as function +(list + . + (symbol) @function.macro + (#eq? @function.macro "->") + . + (symbol) @variable.parameter + (symbol) @function) + +; (-> 42 x y) highlights 42 as regular number +(list + . + (symbol) @function.macro + (#eq? @function.macro "->") + . + (_) + (symbol) @function) + +;;; generic highlighting for all forms + +; first symbol in a list form is a combiner call +(list . (symbol) @function) + +; highlight symbols as vars only when they're clearly vars +(cons (symbol) @variable) +(scope (symbol) @variable) +(path form: (symbol) @variable) +(symbind form: (symbol) @variable)