Merge branch 'master' into circleci

.github/workflows/bench.yml

@@ -12,6 +12,9 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
+    # Cancel queued workflows from earlier commits in this branch
+    - uses: technote-space/auto-cancel-redundant-workflow@v1
+
     - uses: actions/checkout@v2
     - run: git fetch origin master # check the master branch for benchmarking
     - uses: haskell/actions/setup@v1

.github/workflows/build.yml

@@ -65,6 +65,13 @@ jobs:
         echo "LINUX_CABAL_ARGS=--enable-executable-static --ghc-options=-split-sections" >> $GITHUB_ENV
         echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
 
+    - name: Set some macOs specific things
+      if: matrix.os == 'macOS-latest'
+      env:
+        GHC_VER: ${{ matrix.ghc }}
+      run: |
+        echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
+
     - name: Build Server
       # Try building it twice in case of flakey builds on Windows
       run: |

.github/workflows/nix.yml

@@ -12,6 +12,9 @@ jobs:
         os: [ubuntu-latest, macOS-latest]
 
     steps:
+    # Cancel queued workflows from earlier commits in this branch
+    - uses: technote-space/auto-cancel-redundant-workflow@v1
+
     - uses: actions/checkout@v2
       with:
         submodules: true

.github/workflows/test.yml

@@ -25,8 +25,8 @@ jobs:
             ghc: "8.10.2.2" # only available for windows and choco
 
     steps:
-      # Cancel queued workflows from earlier commits in this branch
+     # Cancel queued workflows from earlier commits in this branch
-      - uses: fkirc/skip-duplicate-actions@master
+      - uses: technote-space/auto-cancel-redundant-workflow@v1
 
       - uses: actions/checkout@v2
         with:

ChangeLog.md

@@ -3,6 +3,7 @@
 ## 0.8.0
 
 - This version adds support for ghc-8.10.3
+- `hls-plugin-api` has been bumped to 0.6.0.0 and `ghcide` has been bumped from 0.6.0.1 to 0.7.0.0.
 - It has a new brand plugin: hls-class-plugin, which helps to write class instances
 
 ![gif](https://user-images.githubusercontent.com/12473268/103059293-af071f80-4572-11eb-963a-7e76b45f28b9.gif)
@@ -19,7 +20,8 @@
   - ghcide lives now directly in this repository
   - the test suite has been cleaned and improved (continuing the work done in 0.7.0)
 
-thanks to all contributors and happy new year!
+
+Thanks to all contributors and happy new year!
 
 ### Pull requests merged for 0.8.0
 

cabal.project

@@ -23,7 +23,7 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-12-13T11:31:58Z
+index-state: 2021-01-03T11:58:44Z
 
 allow-newer:
 	active:base,

ghcide/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.7.0 (2020-01-03)
+
+* Retry a failed cradle if the cradle descriptor changes (#762) - (Pepe Iborra)
+* Fix extend imports regression (#769) - (Pepe Iborra)
+* Perform memory measurement on SIGUSR1 (#761) - (Pepe Iborra)
+
 ### 0.6.0.2 (2020-12-26)
 * Fix disappearing diagnostics bug (#959) - (Pepe Iborra)
 * Deduplicate module not found diagnostics (#952) - (Pepe Iborra)

ghcide/ghcide.cabal

@@ -2,7 +2,7 @@ cabal-version:      1.20
 build-type:         Simple
 category:           Development
 name:               ghcide
-version:            0.6.0.2
+version:            0.7.0.0
 license:            Apache-2.0
 license-file:       LICENSE
 author:             Digital Asset and Ghcide contributors
@@ -56,7 +56,7 @@ library
         haskell-lsp-types == 0.22.*,
         haskell-lsp == 0.22.*,
         hie-compat,
-        hls-plugin-api,
+        hls-plugin-api >= 0.6,
         lens,
         mtl,
         network-uri,

haskell-language-server.cabal

@@ -1,7 +1,7 @@
 cabal-version:      2.2
 category:           Development
 name:               haskell-language-server
-version:            0.7.1.0
+version:            0.8.0.0
 synopsis:           LSP server for GHC
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -59,10 +59,10 @@ library
     , containers
     , data-default
     , ghc
-    , ghcide                >=0.6.0.1
+    , ghcide                >=0.7
     , gitrev
     , haskell-lsp           ^>=0.22
-    , hls-plugin-api        >=0.5
+    , hls-plugin-api        >=0.6
     , hslogger
     , optparse-applicative
     , optparse-simple
@@ -346,7 +346,7 @@ common hls-test-utils
     , data-default
     , haskell-lsp
     , hie-bios
-    , hls-plugin-api
+    , hls-plugin-api        >=0.6
     , hslogger
     , hspec
     , hspec-core

hls-plugin-api/hls-plugin-api.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          hls-plugin-api
-version:       0.5.0.1
+version:       0.6.0.0
 synopsis:      Haskell Language Server API for plugin communication
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>