Even better

kubukoz · Dec 24, 2024 · 703c927 · 703c927
1 parent 4408463
commit 703c927
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 51 deletions.
diff --git a/modules/core/src/main/scala/playground/MultiServiceResolver.scala b/modules/core/src/main/scala/playground/MultiServiceResolver.scala
@@ -60,7 +60,7 @@ object MultiServiceResolver {
   ): EitherNel[CompilationError, Option[QualifiedIdentifier]] = queryOperationName
     .name
     .flatTraverse { opName =>
-      queryOperationName.identifier.flatMap(_.qualified_identifier) match {
+      queryOperationName.service_identifier match {
         case Some(explicitRef) => resolveExplicitTs(serviceIndex, explicitRef, opName)
         case None              => resolveImplicitTs(opName, serviceIndex, useClauses).map(_.some)
       }

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.qualified_identifier) ++
+            q.select(_.operation_name.service_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,13 @@ module.exports = grammar({
         field("selection", $.identifier)
       ),
 
-    operation_name_qualifier: ($) => seq($.qualified_identifier, "."),
-
-    // todo: model as union?
     query_operation_name: ($) =>
-      seq(
-        field("identifier", optional($.operation_name_qualifier)),
+      choice(
+        seq(
+          field("service_identifier", $.qualified_identifier),
+          ".",
+          field("name", $.operation_name)
+        ),
         field("name", $.operation_name)
       ),