Feature/general improvements

.github/workflows/main.yaml

@@ -1,7 +1,8 @@
+name: Build and Test syntax
 on: [push]
 jobs:
   grammar:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [12.x]

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+on:
+  push:
+    tags:
+      - '*'
+
+name: Deploy Extension
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      # - name: Publish to Open VSX Registry
+      #   uses: HaaLeo/publish-vscode-extension@v0
+      #   with:
+      #     pat: ${{ secrets.OPEN_VSX_TOKEN }}
+      - name: Publish to Visual Studio Marketplace
+        uses: HaaLeo/publish-vscode-extension@v0
+        with:
+          pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
+          registryUrl: https://marketplace.visualstudio.com

.vscode/launch.json

@@ -1,41 +1,34 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
 {
-    "version": "0.1.0",
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
     "configurations": [
         {
             "name": "Launch Extension",
             "type": "extensionHost",
             "request": "launch",
-            "runtimeExecutable": "${execPath}",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}"
             ],
-            "stopOnEntry": false,
-            "sourceMaps": true,
             "outFiles": [
                 "${workspaceFolder}/out/src/**/*.js"
             ],
-            "preLaunchTask": "npm"
+            "preLaunchTask": "npm: watch-dev",
         },
         {
             "name": "Launch Tests",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
-            "env": {
-                "CODE_TESTS_WORKSPACE": "./"
-            },
             "args": [
-                "test/resources/sample.f90",
-                "--disable-extensions",
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
-            "stopOnEntry": false,
-            "sourceMaps": true,
             "outFiles": [
                 "${workspaceFolder}/out/test/**/*.js"
-            ]
-        }
+            ],
+            "preLaunchTask": "npm: pretest setup",
+        },
     ]
 }

.vscode/tasks.json

@@ -1,40 +1,48 @@
-// 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": "2.0.0",
-
-    // we want to run npm
-    "command": "npm",
-
-    // 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",
     "tasks": [
         {
-            "label": "npm",
-            "type": "shell",
-            "command": "npm",
-            "args": [
-                "run",
-                "compile",
-                "--loglevel",
-                "silent"
-            ],
+            "label": "npm: watch-dev",
+            "type": "npm",
+            "script": "watch-dev",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "isBackground": true,
             "problemMatcher": "$tsc-watch",
-            "group": "build"
+            "detail": "tsc -watch -p tsconfig.json"
+        },
+        {
+            "label": "npm: compile-dev",
+            "type": "npm",
+            "script": "compile-dev",
+            "group": "build",
+            "problemMatcher": "$tsc",
+            "detail": "tsc -p tsconfig.json"
+        },
+        {
+            "label": "npm: pretest",
+            "type": "npm",
+            "script": "pretest",
+            "group": "test",
+            "problemMatcher": "$tsc",
+            "detail": "tsc -p tsconfig.test.json"
+        },
+        {
+            "label": "npm: pretest setup",
+            "type": "shell",
+            "dependsOn": [
+                "npm: compile-dev",
+                "npm: pretest"
+            ],
+            "dependsOrder": "sequence",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "detail": "setup for test launch"
+
         }
     ]
 }

CHANGELOG.md

@@ -7,10 +7,43 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.4.0]
+
+### Changed
+
+- Changes the syntax highlighting of preprocessor macros to match that of C++
+- Changes npm `vscode` module to `@types/vscode` and `@vscode/test-electron`
+  ([#263](https://github.com/krvajal/vscode-fortran-support/issues/263))
+
+### Fixed
+
+- Fixes OpenACC syntax highlighting not triggering
+- Fixes internal hover documentation display
+  ([#205](https://github.com/krvajal/vscode-fortran-support/issues/205))
+- Fixes preprocessor syntax highlighting with line continuations
+  ([#248](https://github.com/krvajal/vscode-fortran-support/issues/248))
+- Fixes preprocessor syntax highlighting with derived type and conditionals
+  ([#249](https://github.com/krvajal/vscode-fortran-support/issues/249))
+- Fixes the general preprocessor syntax highlighting and adds testing
+- Fixes using function/subroutine as parameter in functions/subroutines
+  ([#207](https://github.com/krvajal/vscode-fortran-support/issues/207))
+- Fixes labelled conditionals erroneous highlighting
+  ([#204](https://github.com/krvajal/vscode-fortran-support/issues/204))
+- Fixes labelled conditionals erroneous highlighting when followed by whitespace
+  ([#205](https://github.com/krvajal/vscode-fortran-support/issues/205))
+- Fixes labelled `stop` conditions
+  ([#172](https://github.com/krvajal/vscode-fortran-support/issues/172))
+- Fixes incorrect comment capture for type, abstract|extends types
+  ([#262](https://github.com/krvajal/vscode-fortran-support/issues/262))
+
 ### Added
 
 - Adds support for .f18 and .F18 file extensions
   ([#252](https://github.com/krvajal/vscode-fortran-support/pull/252))
+- Adds workflow for automatic publishing to VS Marketplace
+  ([#237](https://github.com/krvajal/vscode-fortran-support/issues/237))
+- Adds basic support for pFUnit (.pf) highlighting
+  ([#185](https://github.com/krvajal/vscode-fortran-support/issues/185))
 
 ## [2.3.0]
 
@@ -28,7 +61,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - Added syntax highlight support for OpenACC
-  ([224](https://github.com/krvajal/vscode-fortran-support/pull/224))
+  ([#224](https://github.com/krvajal/vscode-fortran-support/pull/224))
+
+## [2.2.2] - 2020-12-11
+
+### Fixed
+
+- Fixed fixed-form tab character at start syntax highlighting
+  ([#191](https://github.com/krvajal/vscode-fortran-support/pull/191))
+- Fixed `class` paranthesis erroneous syntax highlighting
+  ([#196](https://github.com/krvajal/vscode-fortran-support/issues/196))
+- Fixed multiline block interface syntax highlighting
+  ([#202](https://github.com/krvajal/vscode-fortran-support/issues/202))
+
+### Changed
+
+- Updated `package.json`
+  ([#192](https://github.com/krvajal/vscode-fortran-support/pull/192))
+- Rewrote solution for `select` in variable name
+  ([#203](https://github.com/krvajal/vscode-fortran-support/pull/203))
 
 ## [2.2.1] - 2020-04-11
 
@@ -92,7 +143,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Changed default configuration of LanguageServer to `false`
-- Update vscode minimal engine
+- Update vscode minimal engine
 
 ## [2.0.0] - 2018-10-14
 
@@ -212,10 +263,31 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - Show docs for intrinsic functions on hover
-  ### Changed
+
+### Changed
+
 - Updated icon for the extension
 - Fix bug on linter not working
 
-## [Unreleased]
+## [0.1.0]
 
 - Initial release
+
+[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...HEAD
+[2.4.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.3.0...v2.4.0
+[2.3.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.2.2...v2.3.0
+[2.2.2]: https://github.com/krvajal/vscode-fortran-support/compare/2.2.1...v2.2.1
+[2.2.1]: https://github.com/krvajal/vscode-fortran-support/compare/2.2.0...v2.2.1
+[2.2.0]: https://github.com/krvajal/vscode-fortran-support/compare/2.1.0...v2.2.0
+[2.1.0]: https://github.com/krvajal/vscode-fortran-support/compare/2.0.2...2.1.0
+[2.0.2]: https://github.com/krvajal/vscode-fortran-support/compare/2.0.0...2.0.2
+[2.0.0]: https://github.com/krvajal/vscode-fortran-support/compare/v1.3.0...v2.0.0
+[1.3.0]: https://github.com/krvajal/vscode-fortran-support/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/krvajal/vscode-fortran-support/compare/v1.1.0...v1.2.0
+[1.1.0]: https://github.com/krvajal/vscode-fortran-support/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/krvajal/vscode-fortran-support/compare/v0.6.3...v1.0.0
+[0.6.3]: https://github.com/krvajal/vscode-fortran-support/compare/v0.6.1...v0.6.3
+[0.6.1]: https://github.com/krvajal/vscode-fortran-support/compare/v0.6.0...v0.6.1
+[0.6.0]: https://github.com/krvajal/vscode-fortran-support/compare/v0.4.5...v0.6.0
+[0.4.5]: https://github.com/krvajal/vscode-fortran-support/compare/v0.4.4...v0.4.5
+[0.4.4]: https://github.com/krvajal/vscode-fortran-support/compare/tag/v0.4.4

README.md

@@ -1,10 +1,10 @@
 # Modern Fortran language support for VSCode
 
-[![Build Status](https://travis-ci.org/krvajal/vscode-fortran-support.svg?branch=master)](https://travis-ci.org/krvajal/vscode-fortran-support)
-[![codecov](https://codecov.io/gh/krvajal/vscode-fortran-support/branch/master/graph/badge.svg)](https://codecov.io/gh/krvajal/vscode-fortran-support)
-[![MIT License](https://img.shields.io/npm/l/stack-overflow-copy-paste.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+[![GitHub Actions](https://github.com/krvajal/vscode-fortran-support/actions/workflows/main.yaml/badge.svg)](https://github.com/krvajal/vscode-fortran-support/actions)
+[![Downloads](https://vsmarketplacebadge.apphb.com/downloads-short/krvajalm.linter-gfortran.svg)](https://marketplace.visualstudio.com/items?itemName=krvajalm.linter-gfortran)
 [![Installs](https://vsmarketplacebadge.apphb.com/installs/krvajalm.linter-gfortran.svg)](https://marketplace.visualstudio.com/items?itemName=krvajalm.linter-gfortran)
-[![GitHub release](https://img.shields.io/github/release/krvajal/vscode-fortran-support.svg)](https://GitHub.com/krvajal/vscode-fortran-support/releases/)
+[![VS Marketplace](https://vsmarketplacebadge.apphb.com/version-short/krvajalm.linter-gfortran.svg)](https://marketplace.visualstudio.com/items?itemName=krvajalm.linter-gfortran)
+[![MIT License](https://img.shields.io/npm/l/stack-overflow-copy-paste.svg?)](http://opensource.org/licenses/MIT)
 
 > This extension provides support for the Fortran programming language. It includes syntax highlighting, debugging, code snippets and a linting based on `gfortran`. You can download the Visual Studio Code editor from [here](https://code.visualstudio.com/download).
 

language-configuration.json

@@ -28,7 +28,23 @@
         {
             "open": "(/",
             "close": "/"
-        }
+        },
+        {
+            "open": "'",
+            "close": "'",
+            "notIn": [
+                "string",
+                "comment"
+            ]
+        },
+        {
+            "open": "\"",
+            "close": "\"",
+            "notIn": [
+                "string",
+                "comment"
+            ]
+        },
     ],
     "surroundingPairs": [
         [