downgrade ts so that we have ui support

kubukoz · Nov 1, 2024 · a0fb6e1 · a0fb6e1
1 parent 906d50d
commit a0fb6e1
Show file tree

Hide file tree

Showing 23 changed files with 69 additions and 493 deletions.
diff --git a/build.sbt b/build.sbt
@@ -117,7 +117,7 @@ lazy val parser = module("parser")
       "io.circe" %% "circe-generic" % "0.14.10" % Test,
       "io.circe" %% "circe-parser" % "0.14.10" % Test,
       "co.fs2" %% "fs2-io" % "3.11.0" % Test,
-      "org.polyvariant.treesitter4s" %% "core" % "0.3-4028f07-SNAPSHOT",
+      "org.polyvariant.treesitter4s" %% "core" % "0.3-e777c6d-SNAPSHOT",
     )
   )
   .dependsOn(

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -18,7 +18,7 @@
             pkgs.sbt
             pkgs.jless
             pkgs.gnupg
-            pkgs.tree-sitter
+            (pkgs.tree-sitter.override { webUISupport = true; })
             # temporary, while we don't download coursier ourselves
             pkgs.coursier
           ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.xvfb-run ];

diff --git a/modules/parser/src/main/resources/darwin-aarch64/libtree-sitter-smithyql.dylib b/modules/parser/src/main/resources/darwin-aarch64/libtree-sitter-smithyql.dylib
diff --git a/modules/parser/src/main/resources/darwin-x86-64/libtree-sitter-smithyql.dylib b/modules/parser/src/main/resources/darwin-x86-64/libtree-sitter-smithyql.dylib
diff --git a/modules/parser/src/main/resources/linux-aarch64/libtree-sitter-smithyql.so b/modules/parser/src/main/resources/linux-aarch64/libtree-sitter-smithyql.so
diff --git a/modules/parser/src/main/resources/linux-x86-64/libtree-sitter-smithyql.so b/modules/parser/src/main/resources/linux-x86-64/libtree-sitter-smithyql.so
diff --git a/modules/parser/src/main/scala/playground/smithyql/parser/ParserTreeSitterDemo.scala b/modules/parser/src/main/scala/playground/smithyql/parser/ParserTreeSitterDemo.scala
@@ -1,24 +1,32 @@
 package playground.smithyql
 
+import org.polyvariant.treesitter4s.Node
 import org.polyvariant.treesitter4s.TreeSitterAPI
 
 object ParserTreeSitterDemo extends App {
 
   def parse(s: String) = {
     val p = TreeSitterAPI.make("smithyql")
     val tree = p.parse(s)
-    println(tree.rootNode.get.fields.keySet)
+    println(
+      tree
+        .rootNode
+        .get
+        .fold[LazyList[Node]](_ #:: _.to(LazyList).flatten)
+        .filter(_.fields.nonEmpty)
+        .find(_.source == "Bax")
+        .get
+        .parents
+        .map(p => p.text)
+        .mkString("\n\n")
+    )
   }
 
   parse(
-    """use service a.b#C
-      |helalsdfhl //a
-      |{
-      |  hello = 42,
-      |  foo = 50,
-      |  x = { y = "hello"},
-      |  z = null,
-      |  aa = [10, true, false, null]
-      |}""".stripMargin
+    """
+    use service foo.bar#Baz
+
+    Bax { x = 42 }
+    """.stripMargin
   )
 }
diff --git a/tree-sitter-smithyql/test/corpus/bindings-comma.txt b/tree-sitter-smithyql/test/corpus/bindings-comma.txt
diff --git a/tree-sitter-smithyql/test/corpus/bindings-multiple.txt b/tree-sitter-smithyql/test/corpus/bindings-multiple.txt
diff --git a/tree-sitter-smithyql/test/corpus/bindings.txt b/tree-sitter-smithyql/test/corpus/bindings.txt
diff --git a/tree-sitter-smithyql/test/corpus/comment.txt b/tree-sitter-smithyql/test/corpus/comment.txt
diff --git a/tree-sitter-smithyql/test/corpus/empty.txt b/tree-sitter-smithyql/test/corpus/empty.txt
diff --git a/tree-sitter-smithyql/test/corpus/full-of-comments.txt b/tree-sitter-smithyql/test/corpus/full-of-comments.txt
diff --git a/tree-sitter-smithyql/test/corpus/just-query.txt b/tree-sitter-smithyql/test/corpus/just-query.txt
diff --git a/tree-sitter-smithyql/test/corpus/just-use.txt b/tree-sitter-smithyql/test/corpus/just-use.txt
diff --git a/tree-sitter-smithyql/test/corpus/service-reference.txt b/tree-sitter-smithyql/test/corpus/service-reference.txt