Merge pull request #293 from fortran-lang/dev

Development version

Author: gnikit

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - run: npm ci
       # - name: Publish to Open VSX Registry
       #   uses: HaaLeo/publish-vscode-extension@v0

.gitignore

@@ -1,4 +1,5 @@
 out
+dist
 node_modules
 .vscode-test
 *.vsix

.vscode/launch.json

@@ -9,8 +9,8 @@
       "type": "extensionHost",
       "request": "launch",
       "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-      "outFiles": ["${workspaceFolder}/out/src/**/*.js"],
-      "preLaunchTask": "npm: watch-dev"
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+      "preLaunchTask": "npm: compile-dev"
     },
     {
       "name": "Launch Tests",
@@ -21,8 +21,8 @@
         "--extensionDevelopmentPath=${workspaceFolder}",
         "--extensionTestsPath=${workspaceFolder}/out/test"
       ],
-      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-      "preLaunchTask": "npm: pretest setup"
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+      "preLaunchTask": "npm: pretest"
     }
   ]
 }

.vscode/settings.json

@@ -29,5 +29,35 @@
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "prettier.configPath": ".prettierrc"
+  "prettier.configPath": ".prettierrc",
+
+  "files.associations": {
+    "*.fd": "FortranFixedForm"
+  },
+
+  // ***************************************************************************
+  // Fortran Options
+  // ***************************************************************************
+  // Fortran providers
+  "fortran.provide.hover": "fortls",
+  "fortran.provide.symbols": "fortls",
+  "fortran.provide.autocomplete": "fortls",
+  // // Linter options
+  "fortran.linter.compiler": "gfortran",
+  "fortran.linter.includePaths": ["/usr/include/", "/usr/include/*"],
+  // Add arguments used in compilation
+  "fortran.linter.extraArgs": [
+    "-fdefault-real-8",
+    "-fdefault-double-8",
+    "-Wunused-variable",
+    "-Wunused-dummy-argument"
+  ],
+  // Formatting options
+  "fortran.formatting.formatter": "findent",
+  "fortran.formatting.findentArgs": ["-Cn", "--align-paren=1"],
+  // Fortran-Language-Server specific options
+  "fortran.fortls.incrementalSync": true,
+  "fortran.fortls.preserveKeywordOrder": true,
+  // Other Fortran options
+  "fortran.preferredCase": "lowercase"
 }

.vscode/tasks.json

@@ -11,34 +11,23 @@
       },
       "isBackground": true,
       "problemMatcher": "$tsc-watch",
-      "detail": "tsc -watch -p tsconfig.json"
+      "detail": "webpack --mode development --watch --progress"
     },
     {
       "label": "npm: compile-dev",
       "type": "npm",
       "script": "compile-dev",
       "group": "build",
       "problemMatcher": "$tsc",
-      "detail": "tsc -p tsconfig.json"
+      "detail": "webpack --mode development"
     },
     {
       "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"
+      "detail": "npm run compile-dev && tsc -p tsconfig.test.json"
     },
     {
       "type": "npm",

.vscodeignore

@@ -1,9 +1,20 @@
 .vscode/**
 .vscode-test/**
-out/test/**
+out/**
+node_modules/**
+tools/**
 test/**
 src/**
 **/*.map
+**/*.ts
 .gitignore
-tsconfig.json
+**/tsconfig*.json
+**/.eslintrc.json
+.husky/
+.github/
+.editorconfig
+.prettierrc
+.prettierignore
 vsc-extension-quickstart.md
+CONTRIBUTING.md
+coverconfig.json

CHANGELOG.md

@@ -7,6 +7,46 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [3.0.0]
+
+### Fixed
+
+- Fixes linting regex to capture a wider spectrum of errors
+  ([#295](https://github.com/krvajal/vscode-fortran-support/issues/295))
+- Fixes linter activation from `Disabled` to some compiler `X` without having
+  to restart the extension
+  ([#296](https://github.com/krvajal/vscode-fortran-support/issues/296))
+- Fixes nopass pointer erroneous syntax highlighting
+  ([#318](https://github.com/krvajal/vscode-fortran-support/issues/318))
+- Fixes `%` accessor highlighting for type-bound subroutines
+  ([#325](https://github.com/krvajal/vscode-fortran-support/issues/325))
+- Fixes `fortls` not spawning when `ignoreWarning` was set to true
+  ([#365](https://github.com/krvajal/vscode-fortran-support/issues/365))
+- Fixes formatting on Windows (needed .exe extension)
+  ([#354](https://github.com/krvajal/vscode-fortran-support/issues/354))
+- Fixes `onSave` formatting errors
+  ([#364](https://github.com/krvajal/vscode-fortran-support/issues/364))
+
+### Changed
+
+- Updates `README` text and animations, changes `SECURITY` and updates `package.json`
+- Changes the interface of the extension to accommodate for the newest features
+  ([#292](https://github.com/krvajal/vscode-fortran-support/issues/292))
+- Changes main parts of the extension to being asynchronous
+  ([#285](https://github.com/krvajal/vscode-fortran-support/issues/285))
+- Changes Language Server prompt from `fortran-language-server` to `fortls`
+- Updates VS Code engine to handle `vsce --pre-release`
+
+### Added
+
+- Adds support for Intel (ifort) and LLVM (flang) compilers
+  ([#291](https://github.com/krvajal/vscode-fortran-support/issues/291))
+- Adds native support for the fortran-language-server (`fortls`) making
+  unnecessary the usage of Fortran Intellisense extension
+  ([#290](https://github.com/krvajal/vscode-fortran-support/issues/290))
+- Adds commands for re/starting/stopping the Language Server
+- Added more options for configuring the `fortls` settings through the UI
+
 ## [2.6.2]
 
 ### Added
@@ -344,7 +384,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release
 
-[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.2...HEAD
+[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v3.0....HEAD
+[3.0.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.2...v3.0.0
 [2.6.2]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.1...v2.6.2
 [2.6.1]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.5.0...v2.6.0