don't look at verbose markers

edgedb · Mar 9, 2024 · ebaa4e4 · ebaa4e4
1 parent e035d58
commit ebaa4e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/EdgeDB.Net.QueryBuilder/Grammar/Reducers/ShapeReducer.cs b/src/EdgeDB.Net.QueryBuilder/Grammar/Reducers/ShapeReducer.cs
@@ -18,7 +18,7 @@ public void Reduce(IQueryBuilder builder, QueryWriter writer)
             {
                 Action<QueryNode>? modifier = marker switch
                 {
-                    _ when marker.Parent?.Type is MarkerType.Function => ApplyShapeReducer,
+                    _ when marker.Parent?.Type is MarkerType.FunctionArg => ApplyShapeReducer,
                     _ => null
                 };
 

diff --git a/src/EdgeDB.Net.QueryBuilder/Lexical/Marker.cs b/src/EdgeDB.Net.QueryBuilder/Lexical/Marker.cs
@@ -23,6 +23,9 @@ public Marker? Parent
                 if(marker == this)
                     continue;
 
+                if (marker.Type is MarkerType.Verbose)
+                    continue;
+
                 if (marker.Position > Position || marker.Size < Size) continue;
                 if (bestMatch is null)
                 {
@@ -45,7 +48,7 @@ public IOrderedEnumerable<Marker> Parents
     {
         get
         {
-            return _writer.Markers.Values.SelectMany(x => x).Where(x => x != this && x.Position <= Position && x.Size >= Size)
+            return _writer.Markers.Values.SelectMany(x => x).Where(x => x.Type is not MarkerType.Verbose && x != this && x.Position <= Position && x.Size >= Size)
                 .OrderBy(x => Position - x.Position + x.Size);
         }
     }