Merge branch 'master' into openacc

Author: Jeff Larkin

.github/workflows/main.yaml

@@ -0,0 +1,17 @@
+on: [push]
+jobs:
+  grammar:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn install
+      - run: yarn test:grammar
+
+ 

.travis.yml

@@ -8,23 +8,33 @@
 
 // A task runner that calls a custom npm script that compiles the extension.
 {
-    "version": "0.1.0",
+    "version": "2.0.0",
 
     // we want to run npm
     "command": "npm",
 
-    // the command is a shell script
-    "isShellCommand": true,
-
-    // show the output window only if unrecognized errors occur.
-    "showOutput": "silent",
-
     // we run the custom script "compile" as defined in package.json
     "args": ["run", "compile", "--loglevel", "silent"],
 
     // The tsc compiler is started in watching mode
     "isBackground": true,
 
     // use the standard tsc in watch mode problem matcher to find compile problems in the output.
-    "problemMatcher": "$tsc-watch"
+    "problemMatcher": "$tsc-watch",
+    "tasks": [
+        {
+            "label": "npm",
+            "type": "shell",
+            "command": "npm",
+            "args": [
+                "run",
+                "compile",
+                "--loglevel",
+                "silent"
+            ],
+            "isBackground": true,
+            "problemMatcher": "$tsc-watch",
+            "group": "build"
+        }
+    ]
 }

.vscode/tasks.json

@@ -0,0 +1,30 @@
+// Available variables which can be used inside of strings.
+// ${workspaceRoot}: the root folder of the team
+// ${file}: the current opened file
+// ${fileBasename}: the current opened file's basename
+// ${fileDirname}: the current opened file's dirname
+// ${fileExtname}: the current opened file's extension
+// ${cwd}: the current working directory of the spawned process
+
+// A task runner that calls a custom npm script that compiles the extension.
+{
+    "version": "0.1.0",
+
+    // we want to run npm
+    "command": "npm",
+
+    // the command is a shell script
+    "isShellCommand": true,
+
+    // show the output window only if unrecognized errors occur.
+    "showOutput": "silent",
+
+    // we run the custom script "compile" as defined in package.json
+    "args": ["run", "compile", "--loglevel", "silent"],
+
+    // The tsc compiler is started in watching mode
+    "isBackground": true,
+
+    // use the standard tsc in watch mode problem matcher to find compile problems in the output.
+    "problemMatcher": "$tsc-watch"
+}

.vscode/tasks.json.old

@@ -184,13 +184,14 @@
     "compile": "tsc -watch -p ./",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "test": "CODE_TESTS_WORKSPACE='./' node ./node_modules/vscode/bin/test",
+    "test:grammar": "vscode-tmgrammar-snap -s source.fortran.free -g ./syntaxes/fortran_free-form.tmLanguage.json -t \"./test/resources/*.f90\"",
     "lint": "node ./node_modules/tslint/bin/tslint ./src/**/*.ts "
   },
   "devDependencies": {
     "@types/fs-extra": "0.0.35",
     "@types/glob": "^5.0.30",
     "@types/mocha": "^2.2.32",
-    "@types/node": "^6.0.40",
+    "@types/node": "^15.12.1",
     "decache": "^4.1.0",
     "fs-extra": "^1.0.0",
     "glob": "^7.1.1",
@@ -201,7 +202,8 @@
     "remap-istanbul": "^0.8.4",
     "tslint": "^4.0.2",
     "typescript": "^3.5.1",
-    "vscode": "^1.1.37"
+    "vscode": "^1.1.37",
+    "vscode-tmgrammar-test": "^0.0.11"
   },
   "husky": {
     "hooks": {

package-lock.json

@@ -8,32 +8,39 @@ import { FortranDocumentSymbolProvider } from './features/document-symbol-provid
 
 import { FORTRAN_FREE_FORM_ID, EXTENSION_ID } from './lib/helper'
 import { FortranLangServer, checkForLangServer } from './lang-server'
-
+import { LoggingService } from './services/logging-service'
+import * as pkg from '../package.json'
 
 export function activate(context: vscode.ExtensionContext) {
-
+  const loggingService = new LoggingService()
   const extensionConfig = vscode.workspace.getConfiguration(EXTENSION_ID)
 
+  loggingService.logInfo(`Extension Name: ${pkg.displayName}`)
+  loggingService.logInfo(`Extension Version: ${pkg.version}`)
+
   if (extensionConfig.get('linterEnabled', true)) {
-    let linter = new FortranLintingProvider()
+    let linter = new FortranLintingProvider(loggingService)
     linter.activate(context.subscriptions)
     vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter)
+  } else {
+    loggingService.logInfo('Linter is not enabled')
   }
 
   if (extensionConfig.get('provideCompletion', true)) {
-    let completionProvider = new FortranCompletionProvider()
+    let completionProvider = new FortranCompletionProvider(loggingService)
     vscode.languages.registerCompletionItemProvider(
       FORTRAN_FREE_FORM_ID,
       completionProvider
     )
+  } else {
+    loggingService.logInfo('Completion Provider is not enabled')
   }
 
   if (extensionConfig.get('provideHover', true)) {
-    let hoverProvider = new FortranHoverProvider()
-    vscode.languages.registerHoverProvider(
-      FORTRAN_FREE_FORM_ID,
-      hoverProvider
-    )
+    let hoverProvider = new FortranHoverProvider(loggingService)
+    vscode.languages.registerHoverProvider(FORTRAN_FREE_FORM_ID, hoverProvider)
+  } else {
+    loggingService.logInfo('Hover Provider is not enabled')
   }
 
   if (extensionConfig.get('provideSymbols', true)) {
@@ -42,10 +49,11 @@ export function activate(context: vscode.ExtensionContext) {
       FORTRAN_FREE_FORM_ID,
       symbolProvider
     )
+  } else {
+    loggingService.logInfo('Symbol Provider is not enabled')
   }
 
   if (checkForLangServer(extensionConfig)) {
-
     const langServer = new FortranLangServer(context, extensionConfig)
     langServer.start()
     langServer.onReady().then(() => {