Merge abf2f1c into d49e276

EduardSergeev · Sep 21, 2020 · 1677908 · 1677908
2 parents d49e276 + abf2f1c
commit 1677908
Show file tree

Hide file tree

Showing 10 changed files with 3,269 additions and 2,791 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -0,0 +1,29 @@
+name: branch
+
+on:
+  push:
+    branches-ignore:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env: { CODE_VERSION: 'stable', DISPLAY: ':99.0' }
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup GHC environment
+      run: |
+        echo "::add-path::/opt/ghc/bin"
+        stack ghci --ghci-options --version
+
+    - run: npm install
+
+    - name: Run tests
+      uses: GabrielBB/xvfb-action@v1.4
+      with:
+        run: npm test
+
+    - name: Add GHC extension output (on failure)
+      if: failure()
+      run: find ~/.config/Code/logs -name *GHC* -exec cat {} \;
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -0,0 +1,84 @@
+name: master
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+        env:
+          - { CODE_VERSION: 1.26.0, DISPLAY: ':99.0' }
+          - { CODE_VERSION: 'stable', DISPLAY: ':99.0' }
+    runs-on: ${{ matrix.os }}
+    env: ${{ matrix.env }}
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup GHC environment
+      run: |
+        echo "::add-path::/opt/ghc/bin"
+        stack ghci --ghci-options --version
+
+    - run: npm install
+
+    - name: Run tests
+      uses: GabrielBB/xvfb-action@v1.4
+      with:
+        run: npm test
+
+    - name: Add GHC extension output (on failure)
+      if: failure() && runner.os == 'Linux'
+      run: find ~/.config/Code/logs -name *GHC* -exec cat {} \;
+
+  metrics:
+    runs-on: ubuntu-latest
+    env: { CODE_VERSION: 1.48.0, DISPLAY: ':99.0' }
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup GHC environment
+      run: |
+        echo "::add-path::/opt/ghc/bin"
+        stack ghci --ghci-options --version
+
+    - run: npm install
+
+    - name: Run tests with coverage
+      uses: GabrielBB/xvfb-action@v1.4
+      with:
+        run: npm run coverage
+
+    - name: Publish coverage on Coveralls.io
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: ./out/coverage/lcov.info
+
+  upload:
+    if: github.event_name == 'push' && startsWith(github.event.base_ref, 'refs/heads/master')
+    needs:
+      - build
+      - metrics
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - run: npm install
+
+    - name: Upload new version to MS Marketplace
+      run: npm run upload
+      env:
+        VSCE_PAT: ${{ secrets.VSCE_PAT }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,8 +1,13 @@
 {
-    "files.exclude": {
-        "**/out": true,
-        "**/node_modules": true,
-        "**/.vscode-test/": true,
-        "**/*.vsix": true
-    }
-}
+  "files.exclude": {
+    "**/out": true,
+    "**/node_modules": true,
+    "**/.vscode-test/": true,
+    "**/*.vsix": true
+  },
+  "markdownlint.config": {
+    "MD022": false,
+    "MD024": false,
+    "MD032": false
+  }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,141 +1,145 @@
 # Change Log
 All notable changes to the "Haskutil" extension will be documented in this file.
 
-## [0.10.2] - unreleased
+## [0.10.2] - 2020-09-22
+### Added
+* Github actions build: matrix builds on multiple platforms and publishing to Marketplace on version tag push
 ### Fixed
- * Test coverage
+* Test coverage
+* CHANGELOG.md warnings
+### Removed
+* Travis-ci build
 
 ## [0.10.1] - 2020-09-17
 ### Fixed
- * Bump `lodash` dependency version to fix security vulnerabilitiy
+* Bump `lodash` dependency version to fix security vulnerabilitiy
 
 ## [0.10.0] - 2020-05-09
 ### Added
- * `haskutil.organiseImportsOnInsert` configuration option
+* `haskutil.organiseImportsOnInsert` configuration option
 ### Fixed
- * Run multiple Hoogle requests in parallel
+* Run multiple Hoogle requests in parallel
 
 ## [0.9.2] - 2020-05-04
 ### Added
- * Test coverage
+* Test coverage
 
 ## [0.9.1] - 2020-05-04
 ### Fixed
- * Exclude unrelated files from .vsix package
- * CHANGLELOG (add missing contributer)
+* Exclude unrelated files from .vsix package
+* CHANGLELOG (add missing contributer)
 
 ## [0.9.0] - 2020-05-04
 ### Added
- * Add [ghcide](https://marketplace.visualstudio.com/items?itemName=DigitalAssetHoldingsLLC.ghcide) as an option for base extension populating PROBLEMS ([#29](https://github.com/EduardSergeev/vscode-haskutil/pull/29) - thanks to [ArturGajowy](https://github.com/ArturGajowy) for contribution)
+* Add [ghcide](https://marketplace.visualstudio.com/items?itemName=DigitalAssetHoldingsLLC.ghcide) as an option for base extension populating PROBLEMS ([#29](https://github.com/EduardSergeev/vscode-haskutil/pull/29) - thanks to [ArturGajowy](https://github.com/ArturGajowy) for contribution)
 
 ## [0.8.1] - 2020-04-20
 ### Fixed
- * Untitled files re-opening themselves after closing ([#28](https://github.com/EduardSergeev/vscode-haskutil/pull/28) - thanks to [dramforever](https://github.com/dramforever) for contribution)
- * Haskutil complaining about non-Haskell files with unorganized imports
- * Organize import can produce code that the extension considers unorganized ([#26](https://github.com/EduardSergeev/vscode-haskutil/issues/26))
+* Untitled files re-opening themselves after closing ([#28](https://github.com/EduardSergeev/vscode-haskutil/pull/28) - thanks to [dramforever](https://github.com/dramforever) for contribution)
+* Haskutil complaining about non-Haskell files with unorganized imports
+* Organize import can produce code that the extension considers unorganized ([#26](https://github.com/EduardSergeev/vscode-haskutil/issues/26))
 
 ## [0.8.0] - 2020-04-13
 ### Added
- * Align remaining imports when removing unused imports
+* Align remaining imports when removing unused imports
 ### Fixed
- * Adjust Unused imports diagnostic range when imports are edited/moved
+* Adjust Unused imports diagnostic range when imports are edited/moved
 
 ## [0.7.0] - 2020-04-12
 ### Added
- * Add `Remove unused imports` feature
+* Add `Remove unused imports` feature
 
 ## [0.6.0] - 2020-04-10
 ### Added
- * Add [ghcid](https://marketplace.visualstudio.com/items?itemName=ndmitchell.haskell-ghcid) as an option for base extension populating PROBLEMS 
+* Add [ghcid](https://marketplace.visualstudio.com/items?itemName=ndmitchell.haskell-ghcid) as an option for base extension populating `PROBLEMS`
 
 ## [0.5.3] - 2020-04-09
 ### Fixed
- * Background color of Marketplace banner
+* Background color of Marketplace banner
 
 ## [0.5.2] - 2020-04-09
 ### Fixed
- * Fix detection of missing qualified import on Linux
+* Fix detection of missing qualified import on Linux
 
 ## [0.5.1] - 2020-04-09
 ### Fixed
- * Fix wildcard replacement under GHC 8.8
- * Better handling of wildcards (nested parenthesis and `()` as replacement)
+* Fix wildcard replacement under GHC 8.8
+* Better handling of wildcards (nested parenthesis and `()` as replacement)
 
 ## [0.5.0] - 2020-04-01
 ### Added
- * Settings for turning on/off individual features
+* Settings for turning on/off individual features
 ### Fixed
- * Fix 'Not in scope' error detection (different platforms) ([#16](https://github.com/EduardSergeev/vscode-haskutil/pull/16) - thanks to [serras](https://github.com/serras) for contribution)
- * Make LANGUAGE pragma handling case insensitive 
+* Fix 'Not in scope' error detection (different platforms) ([#16](https://github.com/EduardSergeev/vscode-haskutil/pull/16) - thanks to [serras](https://github.com/serras) for contribution)
+* Make LANGUAGE pragma handling case insensitive
 
 ## [0.4.5] - 2019-07-26
 ### Fixed
- * Fix type wildcard error detection on Linux
+* Fix type wildcard error detection on Linux
 
 ## [0.4.4] - 2019-07-26
 ### Fixed
- * Fix type hole error detection on Linux
+* Fix type hole error detection on Linux
 
 ## [0.4.3] - 2019-05-21
 ### Fixed
- * Upgrade dependent packages to fix security vulnerabilities
+* Upgrade dependent packages to fix security vulnerabilities
 
 ## [0.4.2] - 2019-03-27
 ### Fixed
- * Rolling back version 0.4.1. This version is identical to 0.4.0
+* Rolling back version 0.4.1. This version is identical to 0.4.0
 
 ## [0.4.0] - 2019-03-26
 ### Added
- * Replace type wildcard with GHC suggestion
+* Replace type wildcard with GHC suggestion
 
 ## [0.3.1] - 2019-03-25
 ### Changed
- * Minor fix: remove redundant workaround
+* Minor fix: remove redundant workaround
 
 ## [0.3.0] - 2019-03-24
 ### Added
- * Fill typed hole with GHC suggestion
+* Fill typed hole with GHC suggestion
 
 ## [0.2.2] - 2019-03-10
 ### Fixed
- * Bump dependencies to fix security warning in `node.extend`
+* Bump dependencies to fix security warning in `node.extend`
 
 ## [0.2.1] - 2018-09-30
 ### Added
- * Check if dependent extension is installed
+* Check if dependent extension is installed
 
 ## [0.2.0] - 2018-09-30
 ### Added
- * Organize LANGUAGE extensions (split, align and sort)
- * Configuration of the padding of `import` in `qualified` area
-   (should we always pad with 9 spaces even if there is no `qualified` import)
+* Organize LANGUAGE extensions (split, align and sort)
+* Configuration of the padding of `import` in `qualified` area
+  (should we always pad with 9 spaces even if there is no `qualified` import)
 
 ## [0.1.0] - 2018-09-20
 ### Changed
- * Organize imports (sort and align) 
- * Add top-level signature (documented)
+* Organize imports (sort and align)
+* Add top-level signature (documented)
 
 ## [0.0.4] - 2018-09-19
 ### Added
- * Sort `import` statements
- * Add top-level signature (undocumented)
+* Sort `import` statements
+* Add top-level signature (undocumented)
 
 ## [0.0.3] - 2018-09-15
 ### Added
- * Additional supported `LANGUAGE` extensions
+* Additional supported `LANGUAGE` extensions
 ### Changed
- * Removed dependency on `Haskero`
-### Fixed:
- * Broken ordering on `LANGUAGE` pragma insert
-
+* Removed dependency on `Haskero`
+### Fixed
+* Broken ordering on `LANGUAGE` pragma insert
 
 ## [0.0.2] - 2018-09-14
-### Fixed:
- * Insert imports after all `LANGUAGE` pragmas
- * Show only exactly matched suggestion in `Add import`  
-   (previously `runErrorT`'s module would be included for `runE` variable)
-
-## [0.0.1] - 2018-09-13 
-### Added:
- * Add missing `import` statement
- * Add missing `LANGUAGE` pragma
+### Fixed
+* Insert imports after all `LANGUAGE` pragmas
+* Show only exactly matched suggestion in `Add import`  
+  (previously `runErrorT`'s module would be included for `runE` variable)
+
+## [0.0.1] - 2018-09-13
+### Added
+* Add missing `import` statement
+* Add missing `LANGUAGE` pragma