test: added native symbol provider test

Author: gnikit

src/extension.ts

@@ -114,6 +114,16 @@ export async function activate(context: vscode.ExtensionContext) {
     await showWhatsNew();
     fs.writeFileSync(path.join(__dirname, 'displayReleaseNotes.txt'), 'false');
   }
+  // const GoToHelp = 'Go to Help';
+  // vscode.window.showInformationMessage('Click for more Info', GoToHelp).then(selection => {
+  //   if (selection === GoToHelp) {
+  //     vscode.env.openExternal(
+  //       vscode.Uri.parse(
+  //         'https://github.com/fortran-lang/vscode-fortran-support/blob/main/updates/RELEASE_NOTES-v3.2.md'
+  //       )
+  //     );
+  //   }
+  // });
   return context;
 }
 

src/features/document-symbol-provider.ts

@@ -1,4 +1,3 @@
-/* c8 ignore start */
 import { CancellationToken, TextDocument, TextLine, SymbolInformation } from 'vscode';
 
 import * as vscode from 'vscode';
@@ -29,9 +28,9 @@ export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvi
     return Promise.race([this.parseDoc(document), cancel]);
   }
 
-  parseDoc = async (document: TextDocument) => {
+  private async parseDoc(document: TextDocument) {
     const lines = document.lineCount;
-    let symbols = [];
+    let symbols: SymbolInformation[] = [];
     const symbolTypes = this.getSymbolTypes();
 
     for (let i = 0; i < lines; i++) {
@@ -48,9 +47,9 @@ export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvi
       }
     }
     return symbols;
-  };
+  }
 
-  getSymbolsOfType(type: 'subroutine' | 'function' | 'variable'): ParserFunc {
+  private getSymbolsOfType(type: 'subroutine' | 'function' | 'variable'): ParserFunc {
     switch (type) {
       case 'subroutine':
         return this.parseSubroutineDefinition;
@@ -93,6 +92,7 @@ export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvi
     }
   }
 
+  /* c8 ignore start */
   private parseVariableDefinition(document: TextDocument, line: TextLine) {
     const variable = getDeclaredVar(line);
     if (variable) {
@@ -105,12 +105,10 @@ export class FortranDocumentSymbolProvider implements vscode.DocumentSymbolProvi
       );
     }
   }
+  /* c8 ignore stop */
 
-  getSymbolTypes() {
-    const config = vscode.workspace.getConfiguration(EXTENSION_ID);
-    // It does not make much sense for this to be an input option
+  private getSymbolTypes() {
     const symbolTypes: SymbolType[] = ['subroutine', 'function'];
     return symbolTypes;
   }
 }
-/* c8 ignore stop */

test/fortran/sample.f90

@@ -1,6 +1,9 @@
 program main
-
+  integer :: var
+  var = foo(1)
   call say_hello(1, 2)
+  ! comment
+#define PREPROC
 
 contains
 
@@ -10,4 +13,10 @@ subroutine say_hello(a,b)
     print *, "Hello, World!"
   end subroutine say_hello
 
+  function foo(val) result(res)
+    integer, intent(in) :: val
+    integer :: res
+    res = val + 1
+  end function foo
+
 end program main

test/unitTest/document-system-provider.test.ts

@@ -0,0 +1,23 @@
+import * as path from 'path';
+import * as vscode from 'vscode';
+import { strictEqual } from 'assert';
+import { FortranDocumentSymbolProvider } from '../../src/features/document-symbol-provider';
+
+suite('Document Symbol Provider', () => {
+  let doc: vscode.TextDocument;
+  const fileUri = vscode.Uri.file(path.resolve(__dirname, '../../../test/fortran/sample.f90'));
+
+  suiteSetup(async () => {
+    doc = await vscode.workspace.openTextDocument(fileUri);
+    await vscode.window.showTextDocument(doc);
+  });
+
+  test('should return symbols', async () => {
+    const provider = new FortranDocumentSymbolProvider();
+    const symbols = await provider.provideDocumentSymbols(
+      doc,
+      new vscode.CancellationTokenSource().token
+    );
+    strictEqual(symbols.length, 2);
+  });
+});