Update grammar to be more precise wrt lists

kubukoz · Dec 24, 2024 · a931eda · a931eda
1 parent fadba1d
commit a931eda
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 10 deletions.
diff --git a/modules/core/src/main/scala/playground/MultiServiceResolver.scala b/modules/core/src/main/scala/playground/MultiServiceResolver.scala
@@ -60,8 +60,7 @@ object MultiServiceResolver {
   ): EitherNel[CompilationError, QualifiedIdentifier] =
     queryOperationName.name match {
       case Some(opName) =>
-        // todo: this should be an Option in codegen. might be a bad grammar
-        queryOperationName.identifier.headOption match {
+        queryOperationName.identifier.flatMap(_.qualified_identifier) match {
           case Some(explicitRef) => resolveExplicitTs(serviceIndex, explicitRef, opName)
 
           case None => resolveImplicitTs(opName, serviceIndex, useClauses)

diff --git a/modules/language-support/src/main/scala/playground/language/CompletionProvider.scala b/modules/language-support/src/main/scala/playground/language/CompletionProvider.scala
@@ -120,7 +120,7 @@ object CompletionProvider {
           // includes the current query's service reference
           // as it wouldn't result in ading a use clause
           val presentServiceIdentifiers = {
-            q.select(_.operation_name.identifier) ++
+            q.select(_.operation_name.identifier.qualified_identifier) ++
               sf.select(_.prelude.use_clause.identifier)
           }.flatMap(ASTAdapter.decodeQI)
 

diff --git a/modules/treesitter/src/main/resources/darwin-aarch64/libtree-sitter-smithyql.dylib b/modules/treesitter/src/main/resources/darwin-aarch64/libtree-sitter-smithyql.dylib
diff --git a/modules/treesitter/src/main/resources/darwin-x86-64/libtree-sitter-smithyql.dylib b/modules/treesitter/src/main/resources/darwin-x86-64/libtree-sitter-smithyql.dylib
diff --git a/modules/treesitter/src/main/resources/linux-aarch64/libtree-sitter-smithyql.so b/modules/treesitter/src/main/resources/linux-aarch64/libtree-sitter-smithyql.so
diff --git a/modules/treesitter/src/main/resources/linux-x86-64/libtree-sitter-smithyql.so b/modules/treesitter/src/main/resources/linux-x86-64/libtree-sitter-smithyql.so
diff --git a/modules/treesitter/src/main/scala/playground/generated/nodes/OperationNameQualifier.scala b/modules/treesitter/src/main/scala/playground/generated/nodes/OperationNameQualifier.scala
diff --git a/modules/treesitter/src/main/scala/playground/generated/nodes/QueryOperationName.scala b/modules/treesitter/src/main/scala/playground/generated/nodes/QueryOperationName.scala
diff --git a/tree-sitter-smithyql/grammar.js b/tree-sitter-smithyql/grammar.js
@@ -47,12 +47,11 @@ module.exports = grammar({
         field("selection", $.identifier)
       ),
 
+    operation_name_qualifier: ($) => seq($.qualified_identifier, "."),
+
     query_operation_name: ($) =>
       seq(
-        field(
-          "identifier",
-          optional(prec.left(seq($.qualified_identifier, ".")))
-        ),
+        field("identifier", optional($.operation_name_qualifier)),
         field("name", $.operation_name)
       ),