From 820b4a9c211a49c878ce3f19ed5c349509e7988f Mon Sep 17 00:00:00 2001 From: Sergio Alejandro Vargas Date: Mon, 5 Jul 2021 15:04:42 -0500 Subject: [PATCH] Use `@keyword.function` consistently --- queries/bash/highlights.scm | 3 ++- queries/go/highlights.scm | 2 +- queries/kotlin/highlights.scm | 2 +- queries/ocaml/highlights.scm | 4 +++- queries/r/highlights.scm | 4 +++- queries/verilog/highlights.scm | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm index 2c23efc3f..546228485 100644 --- a/queries/bash/highlights.scm +++ b/queries/bash/highlights.scm @@ -66,9 +66,10 @@ "local" "readonly" "unset" - "function" ] @keyword +"function" @keyword.function + (special_variable_name) @constant ((word) @constant.builtin diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm index 5c6bdf94c..c437b8e31 100644 --- a/queries/go/highlights.scm +++ b/queries/go/highlights.scm @@ -88,7 +88,6 @@ "continue" "default" "defer" - "func" "go" "goto" "interface" @@ -101,6 +100,7 @@ "fallthrough" ] @keyword +"func" @keyword.function "return" @keyword.return "for" @repeat diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm index bdbe36293..b31fc791d 100644 --- a/queries/kotlin/highlights.scm +++ b/queries/kotlin/highlights.scm @@ -115,12 +115,12 @@ "var" "break" "by" - "fun" "companion" "constructor" "throw" ] @keyword +"fun" @keyword.function "return" @keyword.return (null_literal) @keyword diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm index 292d3238c..d6887cb40 100644 --- a/queries/ocaml/highlights.scm +++ b/queries/ocaml/highlights.scm @@ -93,12 +93,14 @@ [ "and" "as" "assert" "begin" "class" "constraint" - "end" "external" "fun" "function" "functor" "in" + "end" "external" "in" "inherit" "initializer" "lazy" "let" "match" "method" "module" "mutable" "new" "nonrec" "object" "of" "private" "rec" "sig" "struct" "type" "val" "virtual" "when" "with" ] @keyword +["fun" "function" "functor"] @keyword.function + ["if" "then" "else"] @conditional ["exception" "try"] @exception diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm index cae023896..bdcfa4c68 100755 --- a/queries/r/highlights.scm +++ b/queries/r/highlights.scm @@ -70,7 +70,6 @@ "while" "if" "else" - "function" "repeat" "for" "in" @@ -84,3 +83,6 @@ (na) (null) ] @keyword + + +"function" @keyword.function diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm index 1c9d3b6fd..044e83f46 100644 --- a/queries/verilog/highlights.scm +++ b/queries/verilog/highlights.scm @@ -3,7 +3,6 @@ [ "module" "endmodule" - "function" "endfunction" "task" "endtask" @@ -27,6 +26,7 @@ "assert" ] @keyword +"function" @keyword.function "return" @keyword.return [