Merge branch 'master' into master

Author: tittoassini

.circleci/config.yml

@@ -72,6 +72,15 @@ defaults: &defaults
         command: stack --stack-yaml=${STACK_FILE} test haskell-language-server --dump-logs --test-arguments="-j1"
         no_output_timeout: 120m
 
+    - run:
+        name: Test hls-tactics-plugin
+        # Tasty by default will run all the tests in parallel. Which should
+        # work ok, but given that these CircleCI runners aren't the beefiest
+        # machine can cause some flakiness. So pass -j1 to Tasty (NOT Stack) to
+        # tell it to go slow and steady.
+        command: stack --stack-yaml=${STACK_FILE} test hls-tactics-plugin:test:tests --dump-logs --test-arguments="-j1"
+        no_output_timeout: 30m
+
     - store_test_results:
         path: test-results
 

.editorconfig

@@ -8,10 +8,10 @@ indent_style = tab
 
 [*]
 end_of_line = LF
+trim_trailing_whitespace = true
+insert_final_newline = true
 
 [*.{hs,lhs}]
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
-insert_final_newline = true
 max_line_length = 80

.github/workflows/build.yml

@@ -7,6 +7,7 @@ defaults:
 on:
   release:
     types: [created]
+
 jobs:
 
   build:

.github/workflows/test.yml

@@ -0,0 +1,68 @@
+name: Testing
+
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        exclude:
+          - os: windows-latest
+            ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
+          - os: windows-latest
+            ghc: '8.8.4' # also fails due to segfault :(
+          - os: windows-latest
+            ghc: '8.8.3' # fails due to segfault
+          - os: windows-latest
+            ghc: '8.8.2' # fails due to error with Cabal
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - uses: actions/setup-haskell@v1
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        cabal-version: '3.2'
+        enable-stack: true
+
+    - name: Cache Cabal
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-cabal
+      with:
+        path: ~/.cabal/
+        key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-
+          ${{ runner.os }}-${{ matrix.ghc }}
+
+    - run: cabal update
+
+    # Need this to work around filepath length limits in Windows
+    - name: Shorten binary names
+      shell: bash
+      run: |
+        sed -i.bak -e 's/haskell-language-server/hls/g' \
+                   -e 's/haskell_language_server/hls/g' \
+                   haskell-language-server.cabal
+        sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
+                   src/**/*.hs exe/*.hs
+
+    - name: Build
+      # Retry it three times to workaround compiler segfaults in windows
+      run: cabal build || cabal build || cabal build
+    - name: Test
+      env:
+        HLS_TEST_EXE: hls
+        HLS_WRAPPER_TEST_EXE: hls-wrapper
+      # run the tests without parallelism, otherwise tasty will attempt to run
+      # all functional test cases simultaneously which causes way too many hls
+      # instances to be spun up for the poor github actions runner to handle
+      run: cabal test --test-options=-j1
+

ChangeLog.md

@@ -1,5 +1,28 @@
 # Changelog for haskell-language-server
 
+## 0.5.1
+
+0.5.1 is a minor bug fix release, mainly fixing an issue with the eval plugin
+as well as upgrading the ormolu and stylish-haskell dependencies.
+
+### Pull requests merged
+- Minimal fix for eval regression
+([#488)](https://github.com/haskell/haskell-language-server/pull/488) by @pepeiborra
+- Bump stylish-haskell to 0.12.2.0
+([#482)](https://github.com/haskell/haskell-language-server/pull/482) by @maksbotan
+- Improve the emacs instructions a little
+([#479)](https://github.com/haskell/haskell-language-server/pull/479) by @michaelpj
+- Update README: HLS is no longer in *very* early stage
+([#475)](https://github.com/haskell/haskell-language-server/pull/475) by @Anrock
+- Tactic plugin: Excludes Dictionary arguments in GADTs in Destruct Tactic
+([#474)](https://github.com/haskell/haskell-language-server/pull/474) by @konn
+- Update doom emacs install instructions in README
+([#470)](https://github.com/haskell/haskell-language-server/pull/470) by @iyefrat
+- Add ghc-8.10.2 to circleci
+([#464)](https://github.com/haskell/haskell-language-server/pull/464) by @jneira
+- Bump ormolu to 0.1.3.0
+([#422)](https://github.com/haskell/haskell-language-server/pull/422) by @AlistairB
+
 ## 0.5.0
 
 0.5.0 comes with a new tactics plugin which provides case splitting, homomorphic case splitting, and lambda introduction: