Fixes Misscategorisation of dummy-variable-list in syntax highlighting #264

Author: gnikit

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixes dummy variable list erroneous syntax highlighting
+  ([#264](https://github.com/krvajal/vscode-fortran-support/issues/264))
+
 ## [2.4.0]
 
 ### Changed

syntaxes/fortran_free-form.tmLanguage.json

@@ -5308,7 +5308,7 @@
 			]
 		},
 		"dummy-variable-list": {
-			"name": "keyword.dummy-variable-list",
+			"name": "meta.dummy-variable-list",
 			"begin": "\\G\\s*(\\()",
 			"beginCaptures": {
 				"1": {

test/resources/abstraction.f90.snap

@@ -63,9 +63,9 @@
 #       ^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran keyword.other.subroutine.fortran
 #                 ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran
 #                  ^^^^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran entity.name.function.subroutine.fortran
-#                               ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.begin.fortran
-#                                ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list variable.parameter.fortran
-#                                 ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.end.fortran
+#                               ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.begin.fortran
+#                                ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list variable.parameter.fortran
+#                                 ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.end.fortran
 #                                  ^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran
 #                                      ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran comment.line.fortran
 #                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran comment.line.fortran
@@ -163,9 +163,9 @@
 #              ^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran keyword.other.subroutine.fortran
 #                        ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran
 #                         ^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran entity.name.function.subroutine.fortran
-#                            ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.begin.fortran
-#                             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list variable.parameter.fortran
-#                              ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.end.fortran
+#                            ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.begin.fortran
+#                             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list variable.parameter.fortran
+#                              ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.end.fortran
 #                               ^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.first-line.fortran
 #                                   ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran comment.line.fortran
 #                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.interface.explicit.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran comment.line.fortran

test/resources/class.f90.snap

@@ -143,15 +143,15 @@
 #   ^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran keyword.other.subroutine.fortran
 #             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran
 #              ^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran entity.name.function.subroutine.fortran
-#                      ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.begin.fortran
-#                       ^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list variable.parameter.fortran
-#                           ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list
-#                            ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list
-#                             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list variable.parameter.fortran
-#                              ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list
-#                               ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list
-#                                ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list variable.parameter.fortran
-#                                 ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.end.fortran
+#                      ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.begin.fortran
+#                       ^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list variable.parameter.fortran
+#                           ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list
+#                            ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list
+#                             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list variable.parameter.fortran
+#                              ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list
+#                               ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list
+#                                ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list variable.parameter.fortran
+#                                 ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.end.fortran
 >
 >      class( test_t ) :: this
 #^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran
@@ -213,9 +213,9 @@
 #   ^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran keyword.other.subroutine.fortran
 #             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran
 #              ^^^^^^^^^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran entity.name.function.subroutine.fortran
-#                            ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.begin.fortran
-#                             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list variable.parameter.fortran
-#                              ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran keyword.dummy-variable-list punctuation.definition.parameters.end.fortran
+#                            ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.begin.fortran
+#                             ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list variable.parameter.fortran
+#                              ^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.first-line.fortran meta.dummy-variable-list punctuation.definition.parameters.end.fortran
 >      type(node) :: a
 #^^^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran
 #      ^^^^ source.fortran.free meta.module.fortran meta.block.specification.module.fortran meta.block.contains.fortran meta.subroutine.fortran meta.block.specification.subroutine.fortran meta.specification.type.fortran meta.specification.type.derived.fortran storage.type.type.fortran