From 5820be3f400ba173ded1847c297b53a0bb0eef0b Mon Sep 17 00:00:00 2001 From: somehussar <148253652+somehussar@users.noreply.github.com> Date: Sat, 14 Mar 2026 08:42:05 +0100 Subject: [PATCH 1/2] Fix mark refining --- .../gui/util/script/interpreter/TreeSitterMarkBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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..a61d10e19 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 @@ -101,8 +101,8 @@ public final class TreeSitterMarkBuilder { } catch (Exception e) { return marks; } - - + + try { List captures = ENGINE.highlights(tree, sourceText); @@ -147,8 +147,7 @@ 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; + return TokenType.METHOD_CALL; } break; From f4e1e51d224b92abfb7d4dff1bedaff510ef8049 Mon Sep 17 00:00:00 2001 From: somehussar <148253652+somehussar@users.noreply.github.com> Date: Sat, 14 Mar 2026 09:38:03 +0100 Subject: [PATCH 2/2] Fix type recognition in global scope --- src/main/java/bigguy/treesitter/java/QueryPatterns.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/bigguy/treesitter/java/QueryPatterns.java b/src/main/java/bigguy/treesitter/java/QueryPatterns.java index 784cbefae..f01cd4be5 100644 --- a/src/main/java/bigguy/treesitter/java/QueryPatterns.java +++ b/src/main/java/bigguy/treesitter/java/QueryPatterns.java @@ -259,6 +259,10 @@ public final class QueryPatterns { "(local_variable_declaration\n" + " declarator: (variable_declarator\n" + " name: (identifier) @local.definition.var))\n" + + "(program\n" + + " (local_variable_declaration\n" + + " declarator: (variable_declarator)\n" + + " name: (identifier) @variable)))\n" + "(formal_parameter\n" + " name: (identifier) @local.definition.parameter)\n" + "(field_declaration\n" +