Merge branch 'release/2.1.2' into dependabot/npm_and_yarn/handlebars-4.7.3

Author: pedro-ricardo

language-configuration.json

@@ -27,7 +27,7 @@
         },
         {
             "open": "(/",
-            "close": "/)"
+            "close": "/"
         }
     ],
     "surroundingPairs": [

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": "2.1.1",
+  "version": "2.1.2",
   "publisher": "krvajalm",
   "engines": {
     "vscode": "^1.30.x"
@@ -120,6 +120,11 @@
           ],
           "description": "Specify additional options to use when calling the gfortran compiler"
         },
+        "fortran.provideSymbols": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enables or disables symbol functionality (disable if using 'Fortran IntelliSense')"
+        },
         "fortran.symbols": {
           "type": [
             "array"
@@ -133,6 +138,16 @@
           ],
           "description": "Specify what kind of symbols should be shown by the symbols' provider"
         },
+        "fortran.provideHover": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enables or hover functionality (disable if using 'Fortran IntelliSense')"
+        },
+        "fortran.provideCompletion": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enables or disables completion functionality (disable if using 'Fortran IntelliSense')"
+        },
         "fortran.preferredCase": {
           "type": "string",
           "default": "lowercase",

package.json

@@ -11,9 +11,6 @@ import { FortranLangServer, checkForLangServer } from './lang-server'
 
 
 export function activate(context: vscode.ExtensionContext) {
-  let hoverProvider = new FortranHoverProvider()
-  let completionProvider = new FortranCompletionProvider()
-  let symbolProvider = new FortranDocumentSymbolProvider()
 
   const extensionConfig = vscode.workspace.getConfiguration(EXTENSION_ID)
 
@@ -23,17 +20,30 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter)
   }
 
-  vscode.languages.registerCompletionItemProvider(
-    FORTRAN_FREE_FORM_ID,
-    completionProvider
-  )
-  vscode.languages.registerHoverProvider(FORTRAN_FREE_FORM_ID, hoverProvider)
-
-  vscode.languages.registerDocumentSymbolProvider(
-    FORTRAN_FREE_FORM_ID,
-    symbolProvider
-  )
-  
+  if (extensionConfig.get('provideCompletion', true)) {
+    let completionProvider = new FortranCompletionProvider()
+    vscode.languages.registerCompletionItemProvider(
+      FORTRAN_FREE_FORM_ID,
+      completionProvider
+    )
+  }
+
+  if (extensionConfig.get('provideHover', true)) {
+    let hoverProvider = new FortranHoverProvider()
+    vscode.languages.registerHoverProvider(
+      FORTRAN_FREE_FORM_ID,
+      hoverProvider
+    )
+  }
+
+  if (extensionConfig.get('provideSymbols', true)) {
+    let symbolProvider = new FortranDocumentSymbolProvider()
+    vscode.languages.registerDocumentSymbolProvider(
+      FORTRAN_FREE_FORM_ID,
+      symbolProvider
+    )
+  }
+
   if (checkForLangServer(extensionConfig)) {
 
     const langServer = new FortranLangServer(context, extensionConfig)

src/extension.ts

@@ -44,7 +44,6 @@ export class FortranDocumentSymbolProvider
 
     for (let i = 0; i < lines; i++) {
       let line: vscode.TextLine = document.lineAt(i);
-      line = { ...line, text: line.text.trim() };
       if (line.isEmptyOrWhitespace) continue;
       let initialCharacter = line.text.trim().charAt(0);
       if (initialCharacter === "!" || initialCharacter === "#") continue;
@@ -75,12 +74,12 @@ export class FortranDocumentSymbolProvider
 
   private parseSubroutineDefinition(line: TextLine) {
     try {
-      const fun = getDeclaredSubroutine(line);
-      if (fun) {
+      const subroutine = getDeclaredSubroutine(line);
+      if (subroutine) {
         let range = new vscode.Range(line.range.start, line.range.end);
         return new vscode.SymbolInformation(
-          fun.name,
-          vscode.SymbolKind.Method,
+          subroutine.name,
+          vscode.SymbolKind.Function,
           range
         );
       }
@@ -90,12 +89,11 @@ export class FortranDocumentSymbolProvider
   }
 
   private parseFunctionDefinition(line: TextLine) {
-    const subroutine = getDeclaredFunction(line);
-    if (subroutine) {
+    const fun = getDeclaredFunction(line);
+    if (fun) {
       let range = new vscode.Range(line.range.start, line.range.end);
-
       return new vscode.SymbolInformation(
-        subroutine.name,
+        fun.name,
         vscode.SymbolKind.Function,
         range
       );

src/features/document-symbol-provider.ts

@@ -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*\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 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

@@ -87,7 +87,7 @@ export const _loadDocString = (keyword: string) => {
 };
 
 export const getIncludeParams = (paths: string[]) => {
-  return paths.map(path => `-I${path}`)
+  return paths.map(path => `-I${path}`);
 };
 
 export function isPositionInString(