Merge pull request #15 from okhaimie-dev/lang-update

Lang update
trbutler4 · Sep 4, 2024 · d04089f · d04089f
2 parents 4070ac6 + f57c42b
commit d04089f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/extension.toml b/extension.toml
@@ -1,14 +1,14 @@
 id = "cairo"
 name = "Cairo"
-version = "0.0.4"
+version = "0.0.5"
 schema_version = 1
 authors = ["Thomas Robert Butler IV trbiv@proton.me", "Okhai Omotuebe okhaio@protonmail.com"]
 description = "Cairo language support for the Zed editor"
 repository = "https://github.com/trbutler4/zed-cairo"
 
 [grammars.cairo]
 repository = "https://github.com/starkware-libs/tree-sitter-cairo"
-commit = "e3a0212261c125cb38248458cd856c0ffee2b398"
+commit = "d5733e05aa19ab69a47026780b1cece213d3e015"
 
 [language_servers.cairo]
 name = "Cairo LSP"

diff --git a/grammars/cairo.wasm b/grammars/cairo.wasm
diff --git a/languages/cairo/highlights.scm b/languages/cairo/highlights.scm
@@ -71,6 +71,8 @@
     "<"
     ">"
   ] @punctuation.bracket)
+(closure_parameters
+  "|" @punctuation.bracket)
 
 ; ---
 ; Variables
@@ -92,6 +94,8 @@
 (parameter
 	pattern: (identifier) @variable.parameter)
 
+(closure_parameters
+	(identifier) @variable.parameter)
 ; -------
 ; Keywords
 ; -------

diff --git a/languages/cairo/indents.scm b/languages/cairo/indents.scm
@@ -115,6 +115,16 @@
   (#not-same-line? @expr-start @pattern-guard)
 ) @indent
 
+; Align closure parameters if they span more than one line
+(closure_parameters
+  "|"
+  .
+  (_) @anchor
+  (_) @expr-end
+  .
+  (#not-same-line? @anchor @expr-end)
+) @align
+
 (for_expression
   "in" @in
   .

diff --git a/languages/cairo/locals.scm b/languages/cairo/locals.scm
@@ -7,6 +7,7 @@
   (type_item)
   (trait_item)
   (impl_item)
+  (closure_expression)
   (block)
 ] @local.scope
 
@@ -20,6 +21,8 @@
 (constrained_type_parameter
   left: (type_identifier) @local.definition)
 
+(closure_parameters (identifier) @local.definition)
+
 ; References
 (identifier) @local.reference
 (type_identifier) @local.reference
diff --git a/languages/cairo/textobjects.scm b/languages/cairo/textobjects.scm
@@ -1,6 +1,9 @@
 (function_item
   body: (_) @function.inside) @function.around
 
+(closure_expression
+  body: (_) @function.inside) @function.around
+
 (struct_item
   body: (_) @class.inside) @class.around
 
@@ -16,6 +19,9 @@
 (parameters
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
 
+(closure_parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
 (type_parameters
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)