diff --git a/src/main/java/bigguy/treesitter/java/HighlightGroup.java b/src/main/java/bigguy/treesitter/java/HighlightGroup.java index de41a6d40..c51df4e61 100644 --- a/src/main/java/bigguy/treesitter/java/HighlightGroup.java +++ b/src/main/java/bigguy/treesitter/java/HighlightGroup.java @@ -12,14 +12,17 @@ package bigguy.treesitter.java; */ public enum HighlightGroup { + PROPERTY("property"), VARIABLE("variable"), + PARAMETER("parameter"), FUNCTION("function"), - FUNCTION_METHOD("function.method"), - FUNCTION_BUILTIN("function.builtin"), + FUNCTION_CALL("function.call"), + SUPER("function.builtin"), TYPE("type"), + TYPE_PARAMETER("type.parameter"), + INTERFACE("interface"), TYPE_BUILTIN("type.builtin"), CONSTRUCTOR("constructor"), - PROPERTY("property"), CONSTANT("constant"), CONSTANT_BUILTIN("constant.builtin"), KEYWORD("keyword"), diff --git a/src/main/java/bigguy/treesitter/java/QueryPatterns.java b/src/main/java/bigguy/treesitter/java/QueryPatterns.java index 784cbefae..5e510c2e8 100644 --- a/src/main/java/bigguy/treesitter/java/QueryPatterns.java +++ b/src/main/java/bigguy/treesitter/java/QueryPatterns.java @@ -20,21 +20,29 @@ public final class QueryPatterns { public static final String HIGHLIGHTS = // Identifiers: methods, constructors, types "(method_declaration name: (identifier) @function)\n" + - "(method_invocation name: (identifier) @function)\n" + - "(super) @function.builtin\n" + + "(method_invocation name: (identifier) @function.call)\n" + "\n" + "(type_identifier) @type\n" + "(class_declaration name: (identifier) @type)\n" + - "(interface_declaration name: (identifier) @type)\n" + + "(interface_declaration name: (identifier) @interface)\n" + "(record_declaration name: (identifier) @type)\n" + "(enum_declaration name: (identifier) @enum)\n" + "(enum_constant name: (identifier) @constant)\n" + "(constructor_declaration name: (identifier) @constructor)\n" + "\n" + + // Type parameters: class Foo, E method(), > + "(type_parameter (type_identifier) @type.parameter)\n" + + "(wildcard \"?\" @type.parameter)\n" + + "\n" + // Field access "(field_access field: (identifier) @property)\n" + "(field_declaration declarator: (variable_declarator name: (identifier) @property))\n" + + // Janino - global fields outside of class + "(program (local_variable_declaration declarator: (variable_declarator name: (identifier) @property)))\n" + "\n" + + // Local variables + "(local_variable_declaration declarator: (variable_declarator name: (identifier) @variable))\n" + + "(formal_parameter name: (identifier) @parameter)\n" + // Literals "(string_literal) @string\n" + "(string_fragment) @string\n" + @@ -45,7 +53,6 @@ public final class QueryPatterns { "[(decimal_floating_point_literal) (hex_floating_point_literal)] @number\n" + "(true) @boolean\n" + "(false) @boolean\n" + - "(null_literal) @constant.builtin\n" + "\n" + // Annotations "(annotation name: (identifier) @attribute)\n" + @@ -56,8 +63,10 @@ public final class QueryPatterns { "(block_comment) @comment\n" + "\n" + // Keywords + "(super) @keyword\n" + + "(this) @keyword\n" + "[\n" + - " \"abstract\" \"assert\" \"break\" \"case\" \"catch\"\n" + + " \"null\" \"abstract\" \"assert\" \"break\" \"case\" \"catch\"\n" + " \"class\" \"continue\" \"default\" \"do\" \"else\"\n" + " \"enum\" \"extends\" \"final\" \"finally\" \"for\"\n" + " \"if\" \"implements\" \"import\" \"instanceof\" \"interface\"\n" + @@ -68,6 +77,14 @@ public final class QueryPatterns { " \"volatile\" \"while\" \"yield\"\n" + "] @keyword\n" + "\n" + + // Primitive types (int, short, long, byte, char → integral_type; + // float, double → floating_point_type; + // boolean → boolean_type; void → void_type) + "(integral_type) @keyword\n" + + "(floating_point_type) @keyword\n" + + "(boolean_type) @keyword\n" + + "(void_type) @keyword\n" + + "\n" + // Operators "[\n" + " \"=\" \">\" \"<\" \"!\" \"~\" \"?\" \":\" \"->\" \"==\" \">=\" \"<=\"\n" + diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TreeSitterMarkBuilder.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TreeSitterMarkBuilder.java index b4ff0e4c2..1588efb99 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TreeSitterMarkBuilder.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TreeSitterMarkBuilder.java @@ -1,11 +1,6 @@ package noppes.npcs.client.gui.util.script.interpreter; -import bigguy.treesitter.java.HighlightCapture; -import bigguy.treesitter.java.HighlightGroup; -import bigguy.treesitter.java.JavaParser; -import bigguy.treesitter.java.JavaQueryEngine; -import bigguy.treesitter.java.SyntaxTree; -import bigguy.treesitter.java.TextSpan; +import bigguy.treesitter.java.*; import noppes.npcs.client.gui.util.script.interpreter.token.TokenType; import java.util.ArrayList; @@ -40,16 +35,19 @@ public final class TreeSitterMarkBuilder { static { Map m = new EnumMap<>(HighlightGroup.class); - m.put(HighlightGroup.VARIABLE, TokenType.DEFAULT); m.put(HighlightGroup.PROPERTY, TokenType.GLOBAL_FIELD); - m.put(HighlightGroup.FUNCTION, TokenType.METHOD_CALL); - m.put(HighlightGroup.FUNCTION_METHOD, TokenType.METHOD_CALL); - m.put(HighlightGroup.FUNCTION_BUILTIN, TokenType.METHOD_CALL); + m.put(HighlightGroup.VARIABLE, TokenType.LOCAL_FIELD); + m.put(HighlightGroup.PARAMETER, TokenType.PARAMETER); + m.put(HighlightGroup.FUNCTION, TokenType.METHOD_DECL); + m.put(HighlightGroup.FUNCTION_CALL, TokenType.METHOD_CALL); + m.put(HighlightGroup.SUPER, TokenType.KEYWORD); m.put(HighlightGroup.CONSTRUCTOR, TokenType.METHOD_DECL); m.put(HighlightGroup.TYPE, TokenType.IMPORTED_CLASS); + m.put(HighlightGroup.INTERFACE, TokenType.INTERFACE_DECL); m.put(HighlightGroup.TYPE_BUILTIN, TokenType.KEYWORD); m.put(HighlightGroup.ENUM, TokenType.ENUM_DECL); m.put(HighlightGroup.CONSTANT, TokenType.STATIC_FINAL_FIELD); + m.put(HighlightGroup.TYPE_PARAMETER, TokenType.GENERIC_TYPE_PARAM); m.put(HighlightGroup.CONSTANT_BUILTIN, TokenType.LITERAL); m.put(HighlightGroup.KEYWORD, TokenType.KEYWORD); m.put(HighlightGroup.KEYWORD_CONTROL, TokenType.KEYWORD); @@ -97,7 +95,7 @@ public final class TreeSitterMarkBuilder { SyntaxTree tree; try { tree = parser.parse(sourceText); - System.out.println(tree.getRootNode().toString()); + System.out.println(SyntaxTreeDebugger.printTree(tree)); } catch (Exception e) { return marks; } @@ -146,18 +144,12 @@ public final class TreeSitterMarkBuilder { switch (group) { case FUNCTION: - if ("identifier".equals(nodeType)) { - // pattern 0 = method_declaration name → decl, pattern 1 = method_invocation name → call - return capture.getPatternIndex() == 0 ? TokenType.METHOD_DECL : TokenType.METHOD_CALL; - } - break; - + return TokenType.METHOD_DECL; case TYPE: if ("identifier".equals(nodeType)) { return TokenType.CLASS_DECL; } return TokenType.IMPORTED_CLASS; - case ENUM: return TokenType.ENUM_DECL;