Skip to content

refactor block queries to remove InsertionQuery system #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsisco11 merged 1 commit into from
Jan 6, 2026
Merged

refactor block queries to remove InsertionQuery system #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TinyTokenizer.Benchmarks/SyntaxTreeBenchmarks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ public SyntaxTree EditInsert()
{
var tree = SyntaxTree.Parse(SmallInput, DefaultSchema);
tree.CreateEditor()
.Insert(Q.BraceBlock.First().InnerStart(), "/* inserted */")
.InsertAfter(Q.BraceBlock.First().Start(), "/* inserted */")
.Commit();
return tree;
}
Expand Down
44 changes: 22 additions & 22 deletions TinyTokenizer.E2ETests/GlslEditorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public void InsertCommentAboveMainMethod()


tree.CreateEditor()
.Insert(mainFuncQuery.Before(), "// Entry point for the fragment shader\r\n")
.InsertBefore(mainFuncQuery, "// Entry point for the fragment shader\r\n")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -277,7 +277,7 @@ public void InsertSampleFromTextureAtTopOfMain()

// Use INamedNode + IBlockContainerNode APIs to locate injection point
tree.CreateEditor()
.Insert(Query.Syntax<GlFunctionNode>().Named("main").InnerStart("body"), "\n vec4 sample = texture(tex, uv);")
.InsertAfter(Query.Syntax<GlFunctionNode>().Named("main").InnerStart("body"), "\n vec4 sample = texture(tex, uv);")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -299,7 +299,7 @@ public void InsertWriteToOutBufferAtEndOfMain()

// Use INamedNode + IBlockContainerNode APIs to locate injection point
tree.CreateEditor()
.Insert(Query.Syntax<GlFunctionNode>().Named("main").InnerEnd("body"), "\n fragColor = color;")
.InsertBefore(Query.Syntax<GlFunctionNode>().Named("main").InnerEnd("body"), "\n fragColor = color;")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -324,7 +324,7 @@ public void InsertCommentAfterMainMethod()
Assert.NotNull(mainFunc);

tree.CreateEditor()
.Insert(mainQuery.After(), "\n// End of main function\n")
.InsertAfter(mainQuery, "\n// End of main function\n")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -346,7 +346,7 @@ public void InsertImportBelowVersionDirective()

// Use INamedNode API to find the #version directive and insert after it
tree.CreateEditor()
.Insert(Query.Syntax<GlDirectiveNode>().Named("version").After(), "\n@import \"my-include.glsl\"")
.InsertAfter(Query.Syntax<GlDirectiveNode>().Named("version"), "\n@import \"my-include.glsl\"")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -368,7 +368,7 @@ public void InsertCommentAboveFooMethod()

// Use INamedNode API to find foo function by name
tree.CreateEditor()
.Insert(Query.Syntax<GlFunctionNode>().Named("foo").Before(), "/* foo comment */\n")
.InsertBefore(Query.Syntax<GlFunctionNode>().Named("foo"), "/* foo comment */\n")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -395,17 +395,17 @@ public void ApplyAllEditsInSingleCommit()

tree.CreateEditor()
// 1. Comment above main
.Insert(mainQuery.Before(), "// Entry point for the fragment shader\n")
.InsertBefore(mainQuery, "// Entry point for the fragment shader\n")
// 2. Sample from texture at top of main body
.Insert(mainQuery.InnerStart("body"), "\n vec4 sample = texture(tex, uv);")
.InsertAfter(mainQuery.InnerStart("body"), "\n vec4 sample = texture(tex, uv);")
// 3. Write to out buffer at end of main body
.Insert(mainQuery.InnerEnd("body"), "\n fragColor = sample;")
.InsertBefore(mainQuery.InnerEnd("body"), "\n fragColor = sample;")
// 4. Comment after main
.Insert(mainQuery.After(), "\n// End of main function\n")
.InsertAfter(mainQuery, "\n// End of main function\n")
// 5. Import below #version directive
.Insert(versionQuery.After(), "\n@import \"my-include.glsl\"")
.InsertAfter(versionQuery, "\n@import \"my-include.glsl\"")
// 6. Comment above foo
.Insert(fooQuery.Before(), "/* foo comment */\n")
.InsertBefore(fooQuery, "/* foo comment */\n")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand Down Expand Up @@ -441,7 +441,7 @@ public void UndoRevertsEdits()
Assert.NotNull(mainFunc);

tree.CreateEditor()
.Insert(mainQuery.Before(), "// This comment will be undone\n")
.InsertBefore(mainQuery, "// This comment will be undone\n")
.Commit();

var modifiedText = tree.Root.ToText();
Expand Down Expand Up @@ -498,7 +498,7 @@ public void InnerStart_WithBlockName_InsertsIntoBody()
var mainQuery = Query.Syntax<GlFunctionNode>().Named("main");

tree.CreateEditor()
.Insert(mainQuery.InnerStart("body"), "\n // Body start")
.InsertAfter(mainQuery.InnerStart("body"), "\n // Body start")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand All @@ -516,7 +516,7 @@ public void InnerEnd_WithDefaultBlock_InsertsIntoBody()
var mainQuery = Query.Syntax<GlFunctionNode>().Named("main");

tree.CreateEditor()
.Insert(mainQuery.InnerEnd(), "\n // Body end")
.InsertBefore(mainQuery.InnerEnd(), "\n // Body end")
.Commit();

var result = NormalizeLineEndings(tree.Root.ToText());
Expand Down Expand Up @@ -588,7 +588,7 @@ void main() {
// Insert a new import after the #version directive
var versionQuery = Query.Syntax<GlDirectiveNode>().Named("version");
tree.CreateEditor()
.Insert(versionQuery.After(), "\n@import \"utils.glsl\"")
.InsertAfter(versionQuery, "\n@import \"utils.glsl\"")
.Commit();

// The inserted text is present in serialized content
Expand Down Expand Up @@ -838,7 +838,7 @@ public void TriviaPreservation_AfterEdits_UnmodifiedSectionsKeepExactIndentation
// Make edits to calculateLight
var calcLightQuery = Query.Syntax<GlFunctionNode>().Named("calculateLight");
tree.CreateEditor()
.Insert(calcLightQuery.InnerStart("body"), "\n // INJECTED")
.InsertAfter(calcLightQuery.InnerStart("body"), "\n // INJECTED")
.Commit();

var result = NormalizeLineEndings(tree.ToText());
Expand Down Expand Up @@ -871,9 +871,9 @@ public void TriviaPreservation_UndoRestoresExactOriginal()
// Make edits
var mainQuery = Query.Syntax<GlFunctionNode>().Named("main");
tree.CreateEditor()
.Insert(mainQuery.Before(), "// Comment\n")
.Insert(mainQuery.InnerStart("body"), "\n // Start")
.Insert(mainQuery.InnerEnd("body"), "\n // End")
.InsertBefore(mainQuery, "// Comment\n")
.InsertAfter(mainQuery.InnerStart("body"), "\n // Start")
.InsertBefore(mainQuery.InnerEnd("body"), "\n // End")
.Commit();

// Verify edits were applied
Expand Down Expand Up @@ -930,7 +930,7 @@ void main() {

// === STEP 1: Insert @import after #version ===
tree.CreateEditor()
.Insert(versionQuery.After(), "\n@import \"utils.glsl\"")
.InsertAfter(versionQuery, "\n@import \"utils.glsl\"")
.Commit();

_output.WriteLine("\n=== After inserting @import ===");
Expand Down Expand Up @@ -964,7 +964,7 @@ void main() {
_output.WriteLine($"\n#version after mutations: '{NormalizeLineEndings(versionAfterMutations!.ToText())}'");

tree.CreateEditor()
.Insert(versionQuery.After(), "\n#define DEBUG 1")
.InsertAfter(versionQuery, "\n#define DEBUG 1")
.Commit();

_output.WriteLine("\n=== After inserting #define ===");
Expand Down
Loading
Loading