Merge 7a2d325fa6 into b01fbb4a22

languages.toml

@@ -1022,7 +1022,6 @@ shebangs = []
 comment-token = "#"
 language-servers = [ "nil", "nixd" ]
 indent = { tab-width = 2, unit = "  " }
-formatter = { command = "nixfmt" }
 
 [[grammar]]
 name = "nix"
@@ -4244,11 +4243,10 @@ comment-token = "#"
 block-comment-tokens = ["#-", "-#"]
 indent = { tab-width = 2, unit = "  " }
 language-servers = ["koto-ls"]
-formatter = {command = "koto", args = ["--format"]}
 
 [[grammar]]
 name = "koto"
-source = { git = "https://github.com/koto-lang/tree-sitter-koto", rev = "2ffc77c14f0ac1674384ff629bfc207b9c57ed89" }
+source = { git = "https://github.com/koto-lang/tree-sitter-koto", rev = "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a" }
 
 [[language]]
 name = "gpr"

runtime/queries/koto/highlights.scm

@@ -5,13 +5,11 @@
   "*"
   "/"
   "%"
-  "^"
   "+="
   "-="
   "*="
   "/="
   "%="
-  "^="
   "=="
   "!="
   "<"
@@ -101,18 +99,12 @@
 (export
   (identifier) @namespace)
 
-(chain
-  start: (identifier) @function)
+(call
+  function: (identifier) @function.method)
 
 (chain
   lookup: (identifier) @variable.other.member)
 
-(call
-  function: (identifier)) @function
-
-(call_arg
-  (identifier) @variable.other.member)
-
 [
   (true)
   (false)
@@ -147,10 +139,13 @@
 
 (self) @variable.builtin
 
-(type
-  _ @type)
+(variable
+  type: (identifier) @type)
 
 (arg
   (_ (identifier) @variable.parameter))
 
 (ellipsis) @variable.parameter
+
+(function
+  output_type: (identifier) @type)

runtime/queries/koto/textobjects.scm

@@ -11,6 +11,10 @@
 (call_args
   ((call_arg) @parameter.inside . ","? @parameter.around) @parameter.around)
 
+(chain
+  call: (tuple
+    ((element) @parameter.inside . ","? @parameter.around) @parameter.around))
+
 (map
   ((entry_inline) @entry.inside . ","? @entry.around) @entry.around)