Merge pull request #4 from humaans/update-rescript-bits

Update rescript bits

Author: KidkArolis

Cargo.lock

@@ -1,9 +1,9 @@
 [package]
 name = "zed_rescript"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 publish = false
-license = "Apache-2.0"
+license = "MIT"
 
 # [lints]
 # workspace = true
@@ -13,4 +13,4 @@ path = "src/rescript.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-zed_extension_api = "0.0.6"
+zed_extension_api = "0.1.0"

Cargo.toml

@@ -33,13 +33,3 @@ After opening a ReScript file, open Cmd + Shift + P nav and find
 And to see the language server logs, open Cmd + Shift + P nav and find
 
     debug: open language server logs
-
-## Known issues
-
-This is the a very early cut of this extension and I have noticed:
-
-- it's very slow to bring up autocomplete
-- the syntax partially loses highlighting as you're typing
-- the language server crashes quite easily and doesn't restart
-
-We'll look to work through all these issues in the future releases!

README.md

@@ -1,15 +1,15 @@
 id = "rescript"
 name = "ReScript"
 description = "ReScript support."
-version = "0.1.0"
+version = "0.2.0"
 schema_version = 1
 authors = ["Karolis Narkevicius <hey@kn8.lt>"]
-repository = "https://github.com/zed-industries/zed"
+repository = "https://github.com/humaans/rescript-zed"
 
 [language_servers.rescript-language-server]
 name = "rescript-language-server"
 language = "ReScript"
 
 [grammars.rescript]
 repository = "https://github.com/rescript-lang/tree-sitter-rescript"
-commit = "49fc8378c3566f7a7dcb1b4a8e50ab3fd7cecc52"
+commit = "4606cd81c4c31d1d02390fee530858323410a74c"

extension.toml

@@ -7,30 +7,54 @@
 ((value_identifier) @constant.macro
  (#match? @constant.macro "^\\.*$"))
 
+
+((value_identifier) @variable)
+
 [
   (type_identifier)
   (unit_type)
   (list)
   (list_pattern)
 ] @type
 
+((type_identifier) @type.builtin
+  (#any-of? @type.builtin
+    "int" "char" "string" "float" "bool" "unit"))
+
 [
   (variant_identifier)
   (polyvar_identifier)
-] @constant
+] @constructor
 
 (record_type_field (property_identifier) @property)
 (record_field (property_identifier) @property)
 (object (field (property_identifier) @property))
 (object_type (field (property_identifier) @property))
-(member_expression (property_identifier) @property)
-(module_identifier) @namespace
+(module_identifier) @module
+
+(member_expression (property_identifier) @variable.member)
+
+(value_identifier_path
+  (module_identifier)
+  (value_identifier) @variable)
+
+
+(record_pattern
+  (value_identifier_path
+    (value_identifier) @variable.member))
+
+(record_pattern
+  (value_identifier) @variable)
+
+(labeled_argument
+   label: (value_identifier) @variable.parameter)
+
 
 ; Parameters
 ;----------------
 
-(list_pattern (value_identifier) @parameter)
-(spread_pattern (value_identifier) @parameter)
+(list_pattern (value_identifier) @variable.parameter)
+(spread_pattern (value_identifier) @variable.parameter)
 
 ; String literals
 ;----------------
@@ -40,11 +64,8 @@
   (template_string)
 ] @string
 
-(template_substitution
-  "${" @punctuation.bracket
-  "}" @punctuation.bracket) @embedded
 
-(character) @string.special
+(character) @character
 (escape_sequence) @string.escape
 
 ; Other literals
@@ -53,68 +74,102 @@
 [
   (true)
   (false)
-] @constant.builtin
+] @boolean
 
 (number) @number
-(polyvar) @constant
-(polyvar_string) @constant
+(polyvar) @constructor
+(polyvar_string) @constructor
 
 ; Functions
 ;----------
 
 ; parameter(s) in parens
-[
- (parameter (value_identifier))
- (labeled_parameter (value_identifier))
-] @parameter
+
+(parameter (value_identifier) @variable.parameter)
+(labeled_parameter (value_identifier) @variable.parameter)
 
 ; single parameter with no parens
-(function parameter: (value_identifier) @parameter)
+(function parameter: (value_identifier) @variable.parameter)
 
 ; first-level descructuring (required for nvim-tree-sitter as it only matches direct
 ; children and the above patterns do not match destructuring patterns in NeoVim)
-(parameter (tuple_pattern (tuple_item_pattern (value_identifier) @parameter)))
-(parameter (array_pattern (value_identifier) @parameter))
-(parameter (record_pattern (value_identifier) @parameter))
+(parameter (tuple_pattern (tuple_item_pattern (value_identifier) @variable.parameter)))
+(parameter (array_pattern (value_identifier) @variable.parameter))
+(parameter (record_pattern (value_identifier) @variable.parameter))
+
+; function identifier in let binding
+(let_binding
+  pattern: (value_identifier) @function
+  body: (function))
+
+; function calls
+
+(call_expression
+  function: (value_identifier_path
+    _
+    (value_identifier) @function.call))
+
+(call_expression
+  function: (value_identifier) @function.call)
+
+; highlight the right-hand side of a pipe operator as a function call
+(pipe_expression
+  _
+  [(value_identifier_path
+    _
+    (value_identifier) @function.call)
+    (value_identifier) @function.call])
+
 
 ; Meta
 ;-----
 
-(decorator_identifier) @annotation
+(decorator_identifier) @attribute
 
 (extension_identifier) @keyword
 ("%") @keyword
 
 ; Misc
 ;-----
 
-(subscript_expression index: (string) @property)
-(polyvar_type_pattern "#" @constant)
+(polyvar_type_pattern "#" @constructor)
+
+[
+  "include"
+  "open"
+] @keyword.import
+
+
+[
+   "private"
+   "mutable"
+   "rec"
+] @keyword.modifier
 
 [
-  ("include")
-  ("open")
-] @include
+  "type"
+] @keyword.type
 
 [
+  "and"
+  "with"
   "as"
+] @keyword.operator
+
+[
   "export"
   "external"
   "let"
   "module"
-  "mutable"
-  "private"
-  "rec"
-  "type"
-  "and"
   "assert"
   "await"
-  "with"
   "lazy"
   "constraint"
 ] @keyword
 
-((function "async" @keyword))
+(("await") @keyword.coroutine)
+
+((function "async" @keyword.coroutine))
 
 (module_unpack "unpack" @keyword)
 
@@ -123,30 +178,31 @@
   "else"
   "switch"
   "when"
-] @conditional
+] @keyword.conditional
 
 [
   "exception"
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 (call_expression
-  function: (value_identifier) @exception
-  (#eq? @exception "raise"))
+  function: (value_identifier) @keyword.exception
+   (#eq? @keyword.exception "raise"))
 
 [
   "for"
   "in"
   "to"
   "downto"
   "while"
-] @repeat
+] @keyword.repeat
 
 [
   "."
   ","
   "|"
+  ":"
 ] @punctuation.delimiter
 
 [
@@ -174,6 +230,7 @@
   "|>"
   ":>"
   "+="
+  "=>"
   (uncurry)
 ] @operator
 
@@ -188,8 +245,16 @@
   "}"
   "["
   "]"
+  "<"
+  ">"
 ] @punctuation.bracket
 
+(unit ["(" ")"] @constant.builtin)
+
+(template_substitution
+  "${" @punctuation.special
+   "}" @punctuation.special) @none
+
 (polyvar_type
   [
    "["
@@ -201,12 +266,11 @@
 [
   "~"
   "?"
-  "=>"
   ".."
   "..."
 ] @punctuation.special
 
-(ternary_expression ["?" ":"] @operator)
+(ternary_expression ["?" ":"] @keyword.conditional.ternary)
 
 ; JSX
 ;----------

languages/rescript/highlights.scm

@@ -0,0 +1,7 @@
+(switch_expression) @scope
+
+; Definitions
+;------------
+(type_declaration) @definition.type
+(let_binding) @definition.var
+(module_declaration) @definition.namespace