Merge pull request #623 from fortran-lang/feat/lint-int

Author: gnikit

CHANGELOG.md

@@ -9,13 +9,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added capability for linter options to update automatically when settings change
+  ([#623](https://github.com/fortran-lang/vscode-fortran-support/pull/623))
+- Added unittests for `spawnAsPromise` to increase test coverage
+  ([#623](https://github.com/fortran-lang/vscode-fortran-support/pull/623))
 - Added option to set the verbosity of the Output Channel
   ([#606](https://github.com/fortran-lang/vscode-fortran-support/pull/606))
 - Added increased logging messages in various parts of the extension
   ([#606](https://github.com/fortran-lang/vscode-fortran-support/pull/606))
 
 ### Changed
 
+- Changed the linter to be asynchronous, should imprpove performance
+  ([#623](https://github.com/fortran-lang/vscode-fortran-support/pull/623))
+- Changed native `SymbolProvider` to use non-deprecated constructor
+  ([#623](https://github.com/fortran-lang/vscode-fortran-support/pull/623))
 - Changed how caching is performed in the linter; generalised code and improved
   performance of the cache
   ([#611](https://github.com/fortran-lang/vscode-fortran-support/pull/611))
@@ -30,9 +38,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Fixed issues with linter unittests running asynchronously
+  ([#623](https://github.com/fortran-lang/vscode-fortran-support/pull/623))
 - Fixed `npm run watch-dev` not syncing changes to spawned Extension Dev Host
   ([#602](https://github.com/fortran-lang/vscode-fortran-support/issues/602))
 
+### Removed
+
+- Removed unused tokenizer code
+  ([#623](https://github.com/fortran-lang/vscode-fortran-support/pull/623))
+
 ## [3.2.0]
 
 ### Added

src/features/document-symbol-provider.ts

@@ -1,11 +1,4 @@
-import {
-  CancellationToken,
-  TextDocument,
-  Position,
-  Hover,
-  TextLine,
-  SymbolInformation,
-} from 'vscode';
+import { CancellationToken, TextDocument, TextLine, SymbolInformation } from 'vscode';
 
 import * as vscode from 'vscode';
 import {
@@ -16,7 +9,7 @@ import { parseVars as getDeclaredVar } from '../lib/variables';
 import { EXTENSION_ID } from '../lib/tools';
 
 type SymbolType = 'subroutine' | 'function' | 'variable';
-type ParserFunc = (line: TextLine) => SymbolInformation | undefined;
+type ParserFunc = (document: TextDocument, line: TextLine) => SymbolInformation | undefined;
 
 export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
   vars: Array<vscode.SymbolInformation>;
@@ -47,7 +40,7 @@ export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvi
       if (initialCharacter === '!' || initialCharacter === '#') continue;
       const symbolsInLine = symbolTypes
         .map(type => this.getSymbolsOfType(type))
-        .map(fn => fn(line))
+        .map(fn => fn(document, line))
         .filter(symb => symb !== undefined);
       if (symbolsInLine.length > 0) {
         symbols = symbols.concat(symbolsInLine);
@@ -62,39 +55,53 @@ export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvi
         return this.parseSubroutineDefinition;
       case 'function':
         return this.parseFunctionDefinition;
-
       case 'variable':
         return this.parseVariableDefinition;
       default:
         return () => undefined;
     }
   }
 
-  private parseSubroutineDefinition(line: TextLine) {
+  private parseSubroutineDefinition(document: TextDocument, line: TextLine) {
     try {
       const subroutine = getDeclaredSubroutine(line);
       if (subroutine) {
         const range = new vscode.Range(line.range.start, line.range.end);
-        return new vscode.SymbolInformation(subroutine.name, vscode.SymbolKind.Function, range);
+        return new vscode.SymbolInformation(
+          subroutine.name,
+          vscode.SymbolKind.Function,
+          document.fileName,
+          new vscode.Location(document.uri, range)
+        );
       }
     } catch (err) {
       console.log(err);
     }
   }
 
-  private parseFunctionDefinition(line: TextLine) {
+  private parseFunctionDefinition(document: TextDocument, line: TextLine) {
     const fun = getDeclaredFunction(line);
     if (fun) {
       const range = new vscode.Range(line.range.start, line.range.end);
-      return new vscode.SymbolInformation(fun.name, vscode.SymbolKind.Function, range);
+      return new vscode.SymbolInformation(
+        fun.name,
+        vscode.SymbolKind.Function,
+        document.fileName,
+        new vscode.Location(document.uri, range)
+      );
     }
   }
 
-  private parseVariableDefinition(line: TextLine) {
+  private parseVariableDefinition(document: TextDocument, line: TextLine) {
     const variable = getDeclaredVar(line);
     if (variable) {
       const range = new vscode.Range(line.range.start, line.range.end);
-      return new vscode.SymbolInformation(variable.name, vscode.SymbolKind.Variable, range);
+      return new vscode.SymbolInformation(
+        variable.name,
+        vscode.SymbolKind.Variable,
+        document.fileName,
+        new vscode.Location(document.uri, range)
+      );
     }
   }