Minor release for version 1.3.1 (#80)

* Subroutine arguments highlight improvement.

* Fix symbol list function regex.
* Add '\b' word bound character to avoid false posivites with user variables.
* Replace search for ')' with ')'or'&' to mark functions with more than one line of arguments.

* Add look for '&' character in 'dummy-variable-list'.

* Correct indentation.

* Update changelog.

* Update Date and Version.

* Update package version and correct VSCode warning.

* Revert wrong fix of warning (Older vscode version).

Author: pedro-ricardo

CHANGELOG.md

@@ -5,14 +5,15 @@ All notable changes to this extension will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.3.0] - 2018-06-18
+## [1.3.1] - 2018-06-26
 
 ### Fixed
-* Subroutine symbol list was failing with more than one line arguments (#71)
+* Subroutine and function on symbol list were failing with more than one line arguments (#71)
 * Minor syntax highlighting issues (#62, #73)
 
 ## Added 
 * Implementation of OpenMP directives highlighting (#17)
+* Syntax highlight on multiple line of dummy arguments
 
 ## [1.2.0] - 2018-05-25
 

package-lock.json

@@ -2,7 +2,7 @@
   "name": "linter-gfortran",
   "displayName": "Modern Fortran",
   "description": "Modern Fortran language support, including syntax highlighting and error detection.",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "publisher": "krvajalm",
   "engines": {
     "vscode": "^1.19.0"

package.json

@@ -74,7 +74,7 @@ export const parseSubroutine = (line: TextLine) => {
   return _parse(line, MethodType.Subroutine);
 };
 export const _parse = (line: TextLine, type: MethodType) => {
-  const functionRegEx = /([a-zA-Z]+(\([\w.=]+\))*)*\s*function\s*([a-zA-Z_][a-z0-9_]*)\s*\((\s*[a-z_][a-z0-9_,\s]*)*\s*\)\s*(result\([a-z_][\w]*\))*/i;
+  const functionRegEx = /([a-zA-Z]+(\([\w.=]+\))*)*\s*\bfunction\b\s*([a-zA-Z_][a-z0-9_]*)\s*\((\s*[a-z_][a-z0-9_,\s]*)*\s*(\)|\&)\s*(result\([a-z_][\w]*(\)|\&))*/i;
   const subroutineRegEx = /^\s*(?!\bend\b)\w*\s*\bsubroutine\b\s*([a-z][a-z0-9_]*)\s*(?:\((\s*[a-z][a-z0-9_,\s]*)*\s*(\)|\&))*/i;
   const regEx =
     type === MethodType.Subroutine ? subroutineRegEx : functionRegEx;

src/lib/functions.ts

@@ -4786,7 +4786,7 @@
 					"name": "punctuation.definition.parameters.begin.fortran"
 				}
 			},
-			"end": "(\\)|(?=\\n))",
+			"end": "\\)|(?=\\n)",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.parameters.end.fortran"
@@ -4795,6 +4795,9 @@
 			"patterns": [
 				{
 					"include": "#dummy-variable"
+				},
+				{
+					"include": "#line-continuation-operator"
 				}
 			]
 		},