Update Fortran highlighting

runtime/queries/fortran/highlights.scm

@@ -1,93 +1,112 @@
+(identifier) @variable
+(string_literal) @string
+(number_literal) @number
+(boolean_literal) @boolean
+(comment) @comment
+
 [
  (intrinsic_type)
-  "dimension"
+ "allocatable"
-  "intent"
-  "in"
-  "out"
-  "inout"
-  "type"
-  "endtype"
  "attributes"
-  "global"
  "device"
-  "host"
+ "dimension"
+ "endtype"
+ "global"
  "grid_global"
+ "host"
+ "import"
+ "in"
+ "inout"
+ "intent"
+ "optional"
+ "out"
  "pointer"
-] @keyword.storage.modifier
+ "type"
+ "value"
+ ] @type
 
 [
  "contains"
-  "public"
  "private"
-] @keyword.directive
+ "public"
+ ] @include
 
 [
-"implicit"
+ (none)
-(none)
+ "implicit"
-] @attribute
+ ] @attribute
 
 [
-  "function"
  "endfunction"
  "endprogram"
-  "subroutine"
  "endsubroutine"
-] @keyword.storage
+ "function"
+ "procedure"
+ "subroutine"
+ ] @keyword.function
 
 [
-  "module"
+ (default)
-  "endmodule"
+ (procedure_qualifier)
+ "abstract"
  "bind"
  "call"
  "class"
  "continue"
  "cycle"
+ "endenum"
+ "endinterface"
+ "endmodule"
+ "endprocedure"
+ "endprogram"
+ "endsubmodule"
+ "enum"
  "enumerator"
  "equivalence"
  "exit"
+ "extends"
  "format"
  "goto"
  "include"
  "interface"
-  "endinterface"
+ "intrinsic"
+ "non_intrinsic"
+ "module"
+ "namelist"
  "only"
  "parameter"
-  "procedure"
  "print"
+ "procedure"
  "program"
-  "endprogram"
  "read"
-  "return"
-  "result"
  "stop"
+ "submodule"
  "use"
  "write"
-  "enum"
+ ] @keyword
-  "endenum"
+
-  (default)
+"return" @keyword.return
-  (procedure_qualifier)
-] @keyword
 
 [
-  "if" 
-  "then"
  "else"
  "elseif"
+ "elsewhere"
  "endif"
-  "where"
  "endwhere"
-] @keyword.control.conditional
+ "if"
+ "then"
+ "where"
+ ] @conditional
 
 [
  "do"
  "enddo"
-  "while"
  "forall"
-] @keyword.control.repeat
+ "while"
+ ] @repeat
 
 [
  "*"
-  "**"
  "+"
  "-"
  "/"
@@ -98,7 +117,7 @@
  ">="
  "=="
  "/="
-] @operator
+ ] @operator
 
 [
  "\\.and\\."
@@ -110,27 +129,27 @@
  "\\.eq\\."
  "\\.eqv\\."
  "\\.neqv\\."
-] @keyword.operator
+ ] @keyword.operator
 
-(identifier) @variable
+;; Brackets
-
+[
- ;; Brackets
- [
  "("
  ")"
  "["
  "]"
+ "<<<"
+ ">>>"
  ] @punctuation.bracket
 
- ;; Delimiter
+;; Delimiter
- [
+[
  "::"
  ","
  "%"
  ] @punctuation.delimiter
 
 (parameters
-  (identifier) @variable.parameter)
+  (identifier) @parameter)
 
 (program_statement
   (name) @namespace)
@@ -138,35 +157,41 @@
 (module_statement
   (name) @namespace)
 
+(submodule_statement
+  (module_name) (name) @namespace)
+
 (function_statement
   (name) @function)
 
 (subroutine_statement
   (name) @function)
 
+(module_procedure_statement
+  (name) @function)
+
 (end_program_statement
   (name) @namespace)
 
 (end_module_statement
   (name) @namespace)
 
+(end_submodule_statement
+  (name) @namespace)
+
 (end_function_statement
   (name) @function)
 
 (end_subroutine_statement
   (name) @function)
 
-(subroutine_call
+(end_module_procedure_statement
   (name) @function)
 
+(subroutine_call
+  (identifier) @function)
+
 (keyword_argument
   name: (identifier) @keyword)
 
 (derived_type_member_expression
-  (type_member) @variable.other.member)
+  (type_member) @property)
-
-(string_literal) @string
-(number_literal) @constant.numeric
-(boolean_literal) @constant.builtin.boolean
-(comment) @comment
-