feat!: drop modules, general refactor and cleanup

5 files changed, 193 insertions, 0 deletions

diff --git a/runtime/queries/bass/folds.scm b/runtime/queries/bass/folds.scm
new file mode 100644
index 000000000..d99e0c1ac
--- /dev/null
+++ b/runtime/queries/bass/folds.scm
@@ -0,0 +1,5 @@
+[
+  (list)
+  (scope)
+  (cons)
+] @fold
diff --git a/runtime/queries/bass/highlights.scm b/runtime/queries/bass/highlights.scm
new file mode 100644
index 000000000..f84993af1
--- /dev/null
+++ b/runtime/queries/bass/highlights.scm
@@ -0,0 +1,126 @@
+; Variables
+(list
+  (symbol) @variable)
+
+(cons
+  (symbol) @variable)
+
+(scope
+  (symbol) @variable)
+
+(symbind
+  (symbol) @variable)
+
+; Constants
+((symbol) @constant
+  (#lua-match? @constant "^_*[A-Z][A-Z0-9_]*$"))
+
+; Functions
+(list
+  .
+  (symbol) @function)
+
+; Namespaces
+(symbind
+  (symbol) @module
+  .
+  (keyword))
+
+; Includes
+((symbol) @keyword.import
+  (#any-of? @keyword.import "use" "import" "load"))
+
+; Keywords
+((symbol) @keyword
+  (#any-of? @keyword "do" "doc"))
+
+; Special Functions
+; Keywords construct a symbol
+(keyword) @constructor
+
+((list
+  .
+  (symbol) @keyword.function
+  .
+  (symbol) @function
+  (symbol)? @variable.parameter)
+  (#any-of? @keyword.function "def" "defop" "defn" "fn"))
+
+((cons
+  .
+  (symbol) @keyword.function
+  .
+  (symbol) @function
+  (symbol)? @variable.parameter)
+  (#any-of? @keyword.function "def" "defop" "defn" "fn"))
+
+((symbol) @function.builtin
+  (#any-of? @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"))
+
+((symbol) @function.macro
+  (#any-of? @function.macro
+    "op" "current-scope" "quote" "let" "provide" "module" "or" "and" "curryfn" "for" "$" "linux"))
+
+; Conditionals
+((symbol) @keyword.conditional
+  (#any-of? @keyword.conditional "if" "case" "cond" "when"))
+
+; Repeats
+((symbol) @keyword.repeat
+  (#any-of? @keyword.repeat "each"))
+
+; Operators
+((symbol) @operator
+  (#any-of? @operator "&" "*" "+" "-" "<" "<=" "=" ">" ">="))
+
+; Punctuation
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "["
+  "]"
+] @punctuation.bracket
+
+((symbol) @punctuation.delimiter
+  (#eq? @punctuation.delimiter "->"))
+
+; Literals
+(string) @string
+
+(escape_sequence) @string.escape
+
+(path) @string.special.url
+
+(number) @number
+
+(boolean) @boolean
+
+[
+  (ignore)
+  (null)
+] @constant.builtin
+
+"^" @character.special
+
+; Comments
+(comment) @comment @spell
diff --git a/runtime/queries/bass/indents.scm b/runtime/queries/bass/indents.scm
new file mode 100644
index 000000000..27b976f21
--- /dev/null
+++ b/runtime/queries/bass/indents.scm
@@ -0,0 +1,31 @@
+[
+  (list)
+  (scope)
+  (cons)
+] @indent.begin
+
+[
+  ")"
+  "}"
+  "]"
+] @indent.end
+
+[
+  "("
+  ")"
+] @indent.branch
+
+[
+  "{"
+  "}"
+] @indent.branch
+
+[
+  "["
+  "]"
+] @indent.branch
+
+[
+  (ERROR)
+  (comment)
+] @indent.auto
diff --git a/runtime/queries/bass/injections.scm b/runtime/queries/bass/injections.scm
new file mode 100644
index 000000000..1c2fe3cc9
--- /dev/null
+++ b/runtime/queries/bass/injections.scm
@@ -0,0 +1,5 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((block_comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/runtime/queries/bass/locals.scm b/runtime/queries/bass/locals.scm
new file mode 100644
index 000000000..daed7e5e1
--- /dev/null
+++ b/runtime/queries/bass/locals.scm
@@ -0,0 +1,26 @@
+; Scopes
+[
+  (list)
+  (scope)
+  (cons)
+] @local.scope
+
+; References
+(symbol) @local.reference
+
+; Definitions
+((list
+  .
+  (symbol) @_fnkw
+  .
+  (symbol) @local.definition.function
+  (symbol)? @local.definition.parameter)
+  (#any-of? @_fnkw "def" "defop" "defn" "fn"))
+
+((cons
+  .
+  (symbol) @_fnkw
+  .
+  (symbol) @local.definition.function
+  (symbol)? @local.definition.parameter)
+  (#any-of? @_fnkw "def" "defop" "defn" "fn"))