Prep for token tools update

salve-org · Sep 7, 2024 · dbcdec9 · dbcdec9
1 parent 89be73b
commit dbcdec9
Show file tree

Hide file tree

Showing 8 changed files with 183 additions and 166 deletions.
diff --git a/albero/languages/arduino.py b/albero/languages/arduino.py
@@ -1 +1 @@
-# from tree_sitter_arduino import language as arduino_language (issue opened https://github.com/tree-sitter-grammars/tree-sitter-arduino/issues/30)
+from tree_sitter_arduino import language as arduino_language
diff --git a/albero/languages/compile_languages.py b/albero/languages/compile_languages.py
@@ -1,6 +1,7 @@
 from beartype.typing import Callable
 from tree_sitter import Language
 
+from .arduino import arduino_language
 from .bash import bash_language
 from .c import c_language
 from .c_sharp import c_sharp_language
@@ -31,8 +32,6 @@
 from .wgsl_bevy import wgsl_bevy_language
 from .yaml import yaml_language
 
-# from .arduino import arduino_language
-
 language_functions: dict[str, Callable] = {
     "starlark": starlark_language,
     "commonlisp": commonlisp_language,
@@ -47,7 +46,7 @@
     "php": php_language,
     "cuda": cuda_language,
     "pymanifest": pymanifest_language,
-    # "arduino": arduino_language,
+    "arduino": arduino_language,
     "css": css_language,
     "embedded_template": embedded_template_language,
     "jsdoc": jsdoc_language,

diff --git a/albero/languages/java.py b/albero/languages/java.py
@@ -3,19 +3,24 @@
 java_mapping: dict[str, str] = {
     "block_comment": "Comment",
     "line_comment": "Comment",
+    "abstract": "Keyword",
     "assert": "Keyword",
     "boolean": "Keyword",
     "boolean_type": "Keyword",
+    "break": "Keyword",
     "byte": "Keyword",
+    "case": "Keyword",
     "catch": "Keyword",
     "char": "Keyword",
     "class": "Keyword",
     "do": "Keyword",
+    "default": "Keyword",
     "double": "Keyword",
     "else": "Keyword",
     "extends": "Keyword",
     "false": "Keyword",
     "final": "Keyword",
+    "finally": "Keyword",
     "float": "Keyword",
     "for": "Keyword",
     "if": "Keyword",
@@ -33,6 +38,7 @@
     "return": "Keyword",
     "short": "Keyword",
     "static": "Keyword",
+    "switch": "Keyword",
     "super": "Keyword",
     "this": "Keyword",
     "throw": "Keyword",
@@ -41,8 +47,8 @@
     "try": "Keyword",
     "void_type": "Keyword",
     "while": "Keyword",
-    "identifier": "Name",
-    "type_identifier": "Name",
+    "identifier": "Identifier",
+    "type_identifier": "Identifier",
     "decimal_floating_point_literal": "Number",
     "decimal_integer_literal": "Number",
     "!": "Operator",
@@ -67,6 +73,7 @@
     ">=": "Operator",
     "?": "Operator",
     "||": "Operator",
+    "@": "Operator",
     "(": "Punctuation",
     ")": "Punctuation",
     ",": "Punctuation",

diff --git a/albero/languages/python.py b/albero/languages/python.py
@@ -33,8 +33,8 @@
     "true": "Keyword",
     "while": "Keyword",
     "with": "Keyword",
-    "@": "Name",
-    "identifier": "Name",
+    "@": "Identifier",
+    "identifier": "Identifier",
     "float": "Number",
     "finally": "Number",
     "integer": "Number",
@@ -52,6 +52,8 @@
     "/=": "Operator",
     "<": "Operator",
     "<=": "Operator",
+    "%": "Operator",
+    "%=": "Operator",
     "=": "Operator",
     "==": "Operator",
     ">": "Operator",