Merge pull request #5 from crystal-lang-tools/nobody/crystal-tree-sitter

Move to crystal-lang-tools/tree-sitter-crystal

Author: nobodywasishere

Cargo.lock

@@ -1,12 +1,12 @@
 [package]
-name = "zed_crystal"
-version = "0.0.1"
 edition = "2021"
+name = "zed_crystal"
 publish = false
+version = "0.0.2"
 
 [lib]
-path = "src/crystal.rs"
 crate-type = ["cdylib"]
+path = "src/crystal.rs"
 
 [dependencies]
 zed_extension_api = "0.1.0"

Cargo.toml

@@ -1,10 +1,8 @@
-# Zed Crystal Support (WIP)
+# Crystal Lang Support for Zed
 
-![](./assets/image.png)
+Uses the Crystal lang tree-sitter found at [crystal-lang-tools/tree-sitter-crystal](https://github.com/crystal-lang-tools/tree-sitter-crystal),
+which is mostly complete, and can parse the majority of Crystal's own source code without errors.
 
-This is very much a work in progress as the tree-sitter is developed. Utilizes the tree-sitter found [here](https://github.com/crystal-lang-tools/tree-sitter).
+Also uses [Crystalline](https://github.com/elbywan/crystalline) for LSP functionality, if it is available in `$PATH`.
 
-Dev installation:
-- Clone the repository, rename the folder to `crystal`
-- Install [crystalline](https://github.com/elbywan/crystalline/releases/tag/v0.14.1) and make sure it is on `$PATH`
-- In Zed, install a dev extension with Cmd+Shift+P > `install dev extension`
+![](./assets/image.png)

README.md

@@ -4,17 +4,12 @@ id = "crystal"
 name = "Crystal"
 repository = "https://github.com/crystal-lang-tools/zed-crystal"
 schema_version = 1
-version = "0.0.1"
+version = "0.0.2"
 
-# Use Ruby grammar for now until Crystal grammar is more complete
-[grammars.ruby]
-repository = "https://github.com/tree-sitter/tree-sitter-ruby"
-commit = "7dbc1e2d0e2d752577655881f73b4573f3fe85d4"
+[grammars.crystal]
+commit = "cd3ae0751a58bca9fe875e580102578f5228a5a1"
+repository = "https://github.com/crystal-lang-tools/tree-sitter-crystal"
 
 [language_servers.crystalline]
-name = "crystalline"
 language = "Crystal"
-
-# [grammars.crystal]
-# commit = "61cc201c8eb3b6fd4d4eb3e0ac6c303a580eeb6b"
-# repository = "https://github.com/crystal-lang-tools/tree-sitter"
+name = "crystalline"

assets/image.png

@@ -1,14 +1,28 @@
 ("[" @open "]" @close)
 ("{" @open "}" @close)
 ("\"" @open "\"" @close)
-("do" @open "end" @close)
+("{%" @open "%}" @close)
+("{{" @open "}}" @close)
 
-(block_parameters "|" @open "|" @close)
+(begin "begin" @open "end" @close)
+(block "do" @open "end" @close)
+
+("|" @open "|" @close)
 (interpolation "#{" @open "}" @close)
 
 (if "if" @open "end" @close)
 (unless "unless" @open "end" @close)
-(begin "begin" @open "end" @close)
-(module "module" @open "end" @close)
-(_ . "def" @open "end" @close)
-(_ . "class" @open "end" @close)
+(while "while" @open "end" @close)
+(until "until" @open "end" @close)
+(case "case" @open "end" @close)
+
+(annotation_def "annotation" @open "end" @close)
+(c_struct_def "struct" @open "end" @close)
+(class_def "class" @open "end" @close)
+(enum_def "enum" @open "end" @close)
+(lib_def "lib" @open "end" @close)
+(macro_def "macro" @open "end" @close)
+(method_def "def" @open "end" @close)
+(module_def "module" @open "end" @close)
+(struct_def "struct" @open "end" @close)
+(union_def "union" @open "end" @close)

extension.toml

@@ -1,24 +1,24 @@
-name = "Crystal"
-grammar = "ruby"
-path_suffixes = ["cr"]
-line_comments = ["# "]
 autoclose_before = "}])"
 brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = [
-        "comment",
-        "string",
-    ] },
-    { start = "'", end = "'", close = true, newline = false, not_in = [
-        "comment",
-        "string",
-    ] },
-    { start = "`", end = "`", close = true, newline = false, not_in = [
-        "comment",
-        "string",
-    ] },
+  {start = "{", end = "}", close = true, newline = true},
+  {start = "[", end = "]", close = true, newline = true},
+  {start = "(", end = ")", close = true, newline = true},
+  {start = "\"", end = "\"", close = true, newline = false, not_in = [
+    "comment",
+    "string",
+  ]},
+  {start = "'", end = "'", close = true, newline = false, not_in = [
+    "comment",
+    "string",
+  ]},
+  {start = "`", end = "`", close = true, newline = false, not_in = [
+    "comment",
+    "string",
+  ]},
 ]
 collapsed_placeholder = "# ..."
+grammar = "crystal"
+line_comments = ["# "]
+name = "Crystal"
+path_suffixes = ["cr"]
 tab_size = 2

languages/crystal/brackets.scm

@@ -2,21 +2,43 @@
     (comment)* @context
     .
     [
-        (module
-            "module" @name
+        (alias
+            "alias" @name
             name: (_) @name)
-        (method
-            "def" @name
-            name: (_) @name
-            body: (body_statement) @collapse)
-        (class
+        (annotation_def
+            "annotation" @name
+            name: (_) @name)
+        (c_struct_def
+            "struct" @name
+            name: (_) @name)
+        (class_def
             "class" @name
             name: (_) @name)
-        (singleton_method
+        (const_assign
+            lhs: (_) @name)
+        (enum_def
+            "enum" @name
+            name: (_) @name)
+        (lib_def
+            "lib" @name
+            name: (_) @name)
+        (macro_def
+            "macro" @name
+            name: (_) @name)
+        (method_def
             "def" @name
-            object: (_) @name
-            "." @name
-            name: (_) @name
-            body: (body_statement) @collapse)
-        ] @item
-    )
+            name: (_) @name)
+        (module_def
+            "module" @name
+            name: (_) @name)
+        (struct_def
+            "struct" @name
+            name: (_) @name)
+        (type_def
+            "type" @name
+            name: (_) @name)
+        (union_def
+            "union" @name
+            name: (_) @name)
+    ] @item
+)