diff --git a/src/api b/src/api index f91e17ab3..e7f363727 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit f91e17ab3ef4bf168836f8619c60cf6806f6ab84 +Subproject commit e7f363727e8fea0823d3377fec757dcbd1a467d8 diff --git a/src/main/java/bigguy/treesitter/java/AGENTS.md b/src/main/java/bigguy/texteditor/treesitter/java/AGENTS.md similarity index 100% rename from src/main/java/bigguy/treesitter/java/AGENTS.md rename to src/main/java/bigguy/texteditor/treesitter/java/AGENTS.md diff --git a/src/main/java/bigguy/treesitter/java/AGENTS_DELIVERY.md b/src/main/java/bigguy/texteditor/treesitter/java/AGENTS_DELIVERY.md similarity index 100% rename from src/main/java/bigguy/treesitter/java/AGENTS_DELIVERY.md rename to src/main/java/bigguy/texteditor/treesitter/java/AGENTS_DELIVERY.md diff --git a/src/main/java/bigguy/treesitter/java/COMPLETE_MANIFEST.md b/src/main/java/bigguy/texteditor/treesitter/java/COMPLETE_MANIFEST.md similarity index 100% rename from src/main/java/bigguy/treesitter/java/COMPLETE_MANIFEST.md rename to src/main/java/bigguy/texteditor/treesitter/java/COMPLETE_MANIFEST.md diff --git a/src/main/java/bigguy/treesitter/java/DELIVERY_SUMMARY.md b/src/main/java/bigguy/texteditor/treesitter/java/DELIVERY_SUMMARY.md similarity index 99% rename from src/main/java/bigguy/treesitter/java/DELIVERY_SUMMARY.md rename to src/main/java/bigguy/texteditor/treesitter/java/DELIVERY_SUMMARY.md index 7ad8e13b7..7413105a6 100644 --- a/src/main/java/bigguy/treesitter/java/DELIVERY_SUMMARY.md +++ b/src/main/java/bigguy/texteditor/treesitter/java/DELIVERY_SUMMARY.md @@ -260,7 +260,7 @@ dependencies { ### Step 2: Import and Use ```java -import bigguy.treesitter.java.*; +import bigguy.texteditor.treesitter.java.*; JavaParser parser = new JavaParser(); JavaQueryEngine engine = new JavaQueryEngine(); diff --git a/src/main/java/bigguy/treesitter/java/HighlightCapture.java b/src/main/java/bigguy/texteditor/treesitter/java/HighlightCapture.java similarity index 97% rename from src/main/java/bigguy/treesitter/java/HighlightCapture.java rename to src/main/java/bigguy/texteditor/treesitter/java/HighlightCapture.java index c0f23726e..067c068e4 100644 --- a/src/main/java/bigguy/treesitter/java/HighlightCapture.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/HighlightCapture.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; /** * A single highlight capture result produced by running a highlight query diff --git a/src/main/java/bigguy/treesitter/java/HighlightGroup.java b/src/main/java/bigguy/texteditor/treesitter/java/HighlightGroup.java similarity index 98% rename from src/main/java/bigguy/treesitter/java/HighlightGroup.java rename to src/main/java/bigguy/texteditor/treesitter/java/HighlightGroup.java index c51df4e61..03e9b3a26 100644 --- a/src/main/java/bigguy/treesitter/java/HighlightGroup.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/HighlightGroup.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; /** * Highlight groups corresponding to Zed's capture name conventions. diff --git a/src/main/java/bigguy/treesitter/java/JavaGrammar.java b/src/main/java/bigguy/texteditor/treesitter/java/JavaGrammar.java similarity index 98% rename from src/main/java/bigguy/treesitter/java/JavaGrammar.java rename to src/main/java/bigguy/texteditor/treesitter/java/JavaGrammar.java index 4b028d244..46b0a83ae 100644 --- a/src/main/java/bigguy/treesitter/java/JavaGrammar.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/JavaGrammar.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import org.treesitter.TSLanguage; import org.treesitter.TSQuery; diff --git a/src/main/java/bigguy/treesitter/java/JavaParser.java b/src/main/java/bigguy/texteditor/treesitter/java/JavaParser.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/JavaParser.java rename to src/main/java/bigguy/texteditor/treesitter/java/JavaParser.java index 1f492b3cd..2fe32f4cf 100644 --- a/src/main/java/bigguy/treesitter/java/JavaParser.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/JavaParser.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import org.treesitter.TSParser; import org.treesitter.TSTree; diff --git a/src/main/java/bigguy/treesitter/java/JavaParserConfig.java b/src/main/java/bigguy/texteditor/treesitter/java/JavaParserConfig.java similarity index 98% rename from src/main/java/bigguy/treesitter/java/JavaParserConfig.java rename to src/main/java/bigguy/texteditor/treesitter/java/JavaParserConfig.java index 7e7c05de0..aa887dc83 100644 --- a/src/main/java/bigguy/treesitter/java/JavaParserConfig.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/JavaParserConfig.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; /** * Configuration for {@link JavaParser} behavior. diff --git a/src/main/java/bigguy/treesitter/java/JavaQueryEngine.java b/src/main/java/bigguy/texteditor/treesitter/java/JavaQueryEngine.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/JavaQueryEngine.java rename to src/main/java/bigguy/texteditor/treesitter/java/JavaQueryEngine.java index 27e9f5b67..f7c956c66 100644 --- a/src/main/java/bigguy/treesitter/java/JavaQueryEngine.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/JavaQueryEngine.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import org.treesitter.*; diff --git a/src/main/java/bigguy/treesitter/java/OutlineEntry.java b/src/main/java/bigguy/texteditor/treesitter/java/OutlineEntry.java similarity index 98% rename from src/main/java/bigguy/treesitter/java/OutlineEntry.java rename to src/main/java/bigguy/texteditor/treesitter/java/OutlineEntry.java index bc92d88a2..78a3e57df 100644 --- a/src/main/java/bigguy/treesitter/java/OutlineEntry.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/OutlineEntry.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import java.util.Collections; import java.util.List; diff --git a/src/main/java/bigguy/treesitter/java/QueryPatterns.java b/src/main/java/bigguy/texteditor/treesitter/java/QueryPatterns.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/QueryPatterns.java rename to src/main/java/bigguy/texteditor/treesitter/java/QueryPatterns.java index 0f569e75d..861fd6def 100644 --- a/src/main/java/bigguy/treesitter/java/QueryPatterns.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/QueryPatterns.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; /** * Tree-sitter S-expression query patterns ported from Zed's Java extension. diff --git a/src/main/java/bigguy/treesitter/java/README.md b/src/main/java/bigguy/texteditor/treesitter/java/README.md similarity index 99% rename from src/main/java/bigguy/treesitter/java/README.md rename to src/main/java/bigguy/texteditor/treesitter/java/README.md index fd4f0f11d..25ee565de 100644 --- a/src/main/java/bigguy/treesitter/java/README.md +++ b/src/main/java/bigguy/texteditor/treesitter/java/README.md @@ -180,7 +180,7 @@ dependencies { ```java -import bigguy.treesitter.java.*; +import bigguy.texteditor.treesitter.java.*; public class NpcScriptAnalyzer { private final JavaParser parser = new JavaParser(); diff --git a/src/main/java/bigguy/treesitter/java/RunnableEntry.java b/src/main/java/bigguy/texteditor/treesitter/java/RunnableEntry.java similarity index 98% rename from src/main/java/bigguy/treesitter/java/RunnableEntry.java rename to src/main/java/bigguy/texteditor/treesitter/java/RunnableEntry.java index 22419aac8..f0065cbc2 100644 --- a/src/main/java/bigguy/treesitter/java/RunnableEntry.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/RunnableEntry.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/bigguy/treesitter/java/SyntaxNode.java b/src/main/java/bigguy/texteditor/treesitter/java/SyntaxNode.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/SyntaxNode.java rename to src/main/java/bigguy/texteditor/treesitter/java/SyntaxNode.java index f9ae50fa3..c5d1d20d3 100644 --- a/src/main/java/bigguy/treesitter/java/SyntaxNode.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/SyntaxNode.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import org.treesitter.TSNode; import org.treesitter.TSPoint; diff --git a/src/main/java/bigguy/treesitter/java/SyntaxTree.java b/src/main/java/bigguy/texteditor/treesitter/java/SyntaxTree.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/SyntaxTree.java rename to src/main/java/bigguy/texteditor/treesitter/java/SyntaxTree.java index d26444d14..b3115e630 100644 --- a/src/main/java/bigguy/treesitter/java/SyntaxTree.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/SyntaxTree.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; import org.treesitter.TSInputEdit; import org.treesitter.TSPoint; diff --git a/src/main/java/bigguy/treesitter/java/SyntaxTreeDebugger.java b/src/main/java/bigguy/texteditor/treesitter/java/SyntaxTreeDebugger.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/SyntaxTreeDebugger.java rename to src/main/java/bigguy/texteditor/treesitter/java/SyntaxTreeDebugger.java index 198723bd3..3dedb5669 100644 --- a/src/main/java/bigguy/treesitter/java/SyntaxTreeDebugger.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/SyntaxTreeDebugger.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; /** * A production-ready utility for printing the complete Concrete Syntax Tree (CST) diff --git a/src/main/java/bigguy/treesitter/java/TextSpan.java b/src/main/java/bigguy/texteditor/treesitter/java/TextSpan.java similarity index 99% rename from src/main/java/bigguy/treesitter/java/TextSpan.java rename to src/main/java/bigguy/texteditor/treesitter/java/TextSpan.java index 29e14487f..1305305d0 100644 --- a/src/main/java/bigguy/treesitter/java/TextSpan.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/TextSpan.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java; +package bigguy.texteditor.treesitter.java; /** * An immutable representation of a contiguous range in source text. diff --git a/src/main/java/bigguy/treesitter/java/spi/DebugAdapter.java b/src/main/java/bigguy/texteditor/treesitter/java/spi/DebugAdapter.java similarity index 96% rename from src/main/java/bigguy/treesitter/java/spi/DebugAdapter.java rename to src/main/java/bigguy/texteditor/treesitter/java/spi/DebugAdapter.java index 6a79783c8..c95ab84e3 100644 --- a/src/main/java/bigguy/treesitter/java/spi/DebugAdapter.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/spi/DebugAdapter.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java.spi; +package bigguy.texteditor.treesitter.java.spi; import java.util.Map; diff --git a/src/main/java/bigguy/treesitter/java/spi/LanguageServer.java b/src/main/java/bigguy/texteditor/treesitter/java/spi/LanguageServer.java similarity index 97% rename from src/main/java/bigguy/treesitter/java/spi/LanguageServer.java rename to src/main/java/bigguy/texteditor/treesitter/java/spi/LanguageServer.java index 040e1006b..96a539fa1 100644 --- a/src/main/java/bigguy/treesitter/java/spi/LanguageServer.java +++ b/src/main/java/bigguy/texteditor/treesitter/java/spi/LanguageServer.java @@ -1,4 +1,4 @@ -package bigguy.treesitter.java.spi; +package bigguy.texteditor.treesitter.java.spi; import java.util.Map; diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java index 71d64ff8b..93f6b240f 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java @@ -445,7 +445,7 @@ public class ScriptDocument { ScriptProfiler.end("parseImports"); ScriptProfiler.begin("parseStructure"); - parseStructure(); + // parseStructure(); ScriptProfiler.end("parseStructure"); ScriptProfiler.begin("buildMarks"); 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 1588efb99..5d1ba6420 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,6 +1,6 @@ package noppes.npcs.client.gui.util.script.interpreter; -import bigguy.treesitter.java.*; +import bigguy.texteditor.treesitter.java.*; import noppes.npcs.client.gui.util.script.interpreter.token.TokenType; import java.util.ArrayList;