Merge branch 'master' of https://github.com/haskell/haskell-ide-engine into internal-test-lib

Author: lukel97

.circleci/config.yml

@@ -22,9 +22,9 @@ defaults: &defaults
 
     - restore_cache:
         keys:
-          - stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
-          - stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
-          - stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
+          - stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
+          - stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
+          - stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
 
     - run:
         name: Stack setup
@@ -59,13 +59,14 @@ defaults: &defaults
         command: rm -fr ~/.cache/cabal-helper
 
     - save_cache:
-        key: stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
-        paths:
+        key: stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
+        paths: &cache_paths
           - ~/.stack
           - ~/.cache
           - ~/build/.stack-work
           - ~/build/hie-plugin-api/.stack-work
           - ~/build/submodules/HaRe/.stack-work
+          - ~/build/submodules/brittany/.stack-work
           - ~/build/submodules/ghc-mod/core/.stack-work
           - ~/build/submodules/ghc-mod/.stack-work
           - ~/build/submodules/haskell-lsp/.stack-work
@@ -81,30 +82,12 @@ defaults: &defaults
         path: test-logs
 
     - save_cache:
-        key: stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
-        paths:
-          - ~/.stack
-          - ~/.cache
-          - ~/build/.stack-work
-          - ~/build/hie-plugin-api/.stack-work
-          - ~/build/submodules/HaRe/.stack-work
-          - ~/build/submodules/ghc-mod/core/.stack-work
-          - ~/build/submodules/ghc-mod/.stack-work
-          - ~/build/submodules/haskell-lsp/.stack-work
-          - ~/build/submodules/cabal-helper/.stack-work
+        key: stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
+        paths: *cache_paths
 
     - save_cache:
-        key: stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
-        paths:
-          - ~/.stack
-          - ~/.cache
-          - ~/build/.stack-work
-          - ~/build/hie-plugin-api/.stack-work
-          - ~/build/submodules/HaRe/.stack-work
-          - ~/build/submodules/ghc-mod/core/.stack-work
-          - ~/build/submodules/ghc-mod/.stack-work
-          - ~/build/submodules/haskell-lsp/.stack-work
-          - ~/build/submodules/cabal-helper/.stack-work
+        key: stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
+        paths: *cache_paths
 
 version: 2
 jobs:
@@ -148,6 +131,11 @@ jobs:
       - STACK_FILE: "stack-8.6.2.yaml"
     <<: *defaults
 
+  ghc-8.6.3:
+    environment:
+      - STACK_FILE: "stack-8.6.3.yaml"
+    <<: *defaults
+
   ghc-nightly:
     environment:
       - STACK_FILE: "stack.yaml"
@@ -168,7 +156,7 @@ jobs:
           command: git submodule update --recursive --init
       - restore-cache:
           keys:
-            - cabal-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
+            - cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
       - run:
           name: Cabal version
           command: cabal --version
@@ -182,7 +170,7 @@ jobs:
           name: Build
           command: cabal new-build -j2
       - save_cache:
-          key: cabal-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
+          key: cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
           paths:
             - ~/.cabal
 
@@ -198,5 +186,6 @@ workflows:
       - ghc-8.4.4
       - ghc-8.6.1
       - ghc-8.6.2
+      - ghc-8.6.3
       - ghc-nightly
       - cabal

.gitignore

@@ -44,14 +44,15 @@
 /test/testdata/HaReMoveDef.refactored.hs
 /test/testdata/HaReRename.hs.keep
 /test/testdata/HaReRename.refactored.hs
-/test/testdata/gototest/stack.yaml
-/test/testdata/stack.yaml
 /test/testdata/addPackageTest/**/stack.yaml
 /test/testdata/addPackageTest/**/stack.yaml
 /test/testdata/addPackageTest/hpack/*.cabal
-/test/testdata/redundantImportTest/stack.yaml
+/test/testdata/badProjects/cabal/stack.yaml
 /test/testdata/completion/stack.yaml
 /test/testdata/definition/stack.yaml
+/test/testdata/gototest/stack.yaml
+/test/testdata/redundantImportTest/stack.yaml
+/test/testdata/stack.yaml
 /test/testdata/wErrorTest/stack.yaml
 TAGS
 cabal-dev/
@@ -65,3 +66,6 @@ test-logs/
 .hspec-failures
 /test/testdata/addPragmas/stack.yaml
 .vscode
+
+# shake build information
+_build/

.gitmodules

@@ -1,8 +1,24 @@
+# To remove a submodule you need to:
+#
+#     Delete the relevant section from the .gitmodules file.
+#     Stage the .gitmodules changes git add .gitmodules
+#     Delete the relevant section from .git/config.
+#     Run git rm --cached path_to_submodule (no trailing slash).
+#     Run rm -rf .git/modules/path_to_submodule
+#     Commit git commit -m "Removed submodule <name>"
+#     Delete the now untracked submodule files
+#     rm -rf path_to_submodule
+
+
 [submodule "submodules/HaRe"]
 	path = submodules/HaRe
 	# url = https://github.com/bubba/HaRe.git
 	url = https://github.com/alanz/HaRe.git
 
+[submodule "submodules/brittany"]
+	path = submodules/brittany
+	url = https://github.com/lspitzner/brittany.git
+
 [submodule "submodules/cabal-helper"]
 	path = submodules/cabal-helper
 	# url = https://github.com/arbor/cabal-helper.git
@@ -16,20 +32,3 @@
 	url = https://github.com/alanz/ghc-mod.git
 
 
-[submodule "submodules/yi-rope"]
-	path = submodules/yi-rope
-        url = https://github.com/yi-editor/yi-rope.git
-
-[submodule "submodules/haskell-lsp"]
-	path = submodules/haskell-lsp
-	url = https://github.com/alanz/haskell-lsp.git
-
-[submodule "submodules/brittany"]
-	path = submodules/brittany
-	url = https://github.com/lspitzner/brittany.git
-[submodule "submodules/apply-refact"]
-	path = submodules/apply-refact
-	url = https://github.com/alanz/apply-refact.git
-[submodule "submodules/lsp-test"]
-	path = submodules/lsp-test
-	url = https://github.com/alanz/lsp-test.git

.travis.yml

@@ -1,60 +1,142 @@
 sudo: false
 language: c
 os: osx
-env:
-- GHC_VER=8.4.3
-- GHC_VER=8.4.2
-- GHC_VER=8.2.2
-- GHC_VER=8.2.1
+
 addons:
   homebrew:
     packages:
     - z3
     - stack
-    - cabal-install
+    - upx
+
 cache:
   directories:
   - $HOME/.stack
-  - $HOME/.local/bin
   - $HOME/.cabal/
   - $TRAVIS_BUILD_DIR/.stack-work
+  - $TRAVIS_BUILD_DIR/submodules/brittany/.stack-work
   - $TRAVIS_BUILD_DIR/submodules/HaRe/.stack-work
   - $TRAVIS_BUILD_DIR/submodules/ghc-mod/.stack-work
   - $TRAVIS_BUILD_DIR/submodules/ghc-mod/core/.stack-work
   - $TRAVIS_BUILD_DIR/submodules/haskell-lsp/.stack-work
   - $TRAVIS_BUILD_DIR/submodules/haskell-lsp/haskell-lsp-types/.stack-work
   - $TRAVIS_BUILD_DIR/submodules/cabal-helper/.stack-work
-  - $TRAVIS_BUILD_DIR/submodules/brittany/.stack-work
   - $TRAVIS_BUILD_DIR/hie-plugin-api/.stack-work
   timeout: 800
 before_cache:
   - rm -rf $TRAVIS_BUILD_DIR/.stack-work/logs/
-install:
-- |
-  if [ ! -f $HOME/.cabal/bin/liquid ]; then
-    stack setup 8.2.2
-    cabal update
-    cabal install liquidhaskell -w $HOME/.stack/programs/x86_64-osx/ghc-8.2.2/bin/ghc
-  fi
-- export PATH=$HOME/.cabal/bin/:$PATH
-script:
-- stack build --stack-yaml=stack-$GHC_VER.yaml
-- stack exec hoogle generate --stack-yaml=stack-$GHC_VER.yaml
-- stack test --stack-yaml=stack-$GHC_VER.yaml
-before_deploy:
-- mv .stack-work/install/*/*/*/bin/hie hie-$GHC_VER
-- |
-  if [ "${GHC_VER}" == "8.4.3" ]; then
-    mv .stack-work/install/*/*/8.4.3/bin/hie-wrapper hie-wrapper
-  fi
-deploy:
-  provider: releases
-  api_key:
-    secure: K12xUSzK+VWpnS4gRo04rJjfi71sBi0zuMWKmAcsK1igvmdbsEjyuyX4SxFI58/sM4x5qlyXg/nWSPfECKjpQS7/Q/GG1ub+AjU9kq5iyiWACWjXpDLN9Jz9iLBceyPLaf3y3rswri45v7LdwvMNwSI/wYNKEz97IfJ3VkCR16kWv/cqHGdJUYWZk7lBJX/BL94Bof4zOoXwSiy0GbaSCptcSHm1qwtN1qYsYnmihgLYR0RtLRz6tvBPHmqDjsWAXMDhaEyi0zfZ06igITkm7E4at+c3/wssYfgSg15AT2fd5T+v9keyzyanBzGh9xHYcMmflIA9dAvQawl/vw8sGsnQRaddhmTd0bqKFrtrnMO5dRsbkIyu1r178BQCJVjvy5KqyVpXy1ycDcO17E5qONVr2V838x6eg9uPJBNGR30XMg3ZF+GPsbz0xhzxf2Hhab82pJ+lAAsBlnaPdDNVchs/wjEFMp94hcL+IL4ydaXk91piPVhs3VPsLfGboQ72sUnyPUI2aiKfkk5P4Xug+2UqbX17fXfLgnkRbfyCd/4IeM4IwHgRAKa3tT7017KGSZBShihqe2dDJBjS8MlIxDD+U69HR2TIkAJaDnJe+UFAndoc8w4Ajd2OJ1/C+ey236SZq9R7D3dqyFi6Sxc1kSpNguVmjjvlEUk/Jpz1ckA=
-  file:
-    - hie-$GHC_VER
-    - hie-wrapper
-  file_glob: true
-  skip_cleanup: true
-  on:
-    tags: true
+
+stages:
+  - setup
+  - dependencies
+  - test
+  - deploy
+
+jobs:
+   include:
+     - stage: setup
+       env: GHC_VER="8.4.4"
+       script: &setup
+         - ls .stack-work/install/*/*/*/bin/hie || true
+         - travis_retry stack --no-terminal --install-ghc --stack-yaml=stack-$GHC_VER.yaml setup
+         # Build a big package to offload the next stage from doing too much work
+         - stack --stack-yaml=stack-$GHC_VER.yaml build lens
+
+     - stage: setup
+       env: GHC_VER="8.4.3"
+       script: *setup
+
+     - stage: setup
+       env: GHC_VER="8.4.2"
+       script: *setup
+
+     - stage: setup
+       env: GHC_VER="8.2.2"
+       script: *setup
+
+     - stage: setup
+       env: GHC_VER="8.2.1"
+       script: *setup
+
+     - stage: dependencies
+       env: GHC_VER="8.4.4"
+       script: &dependencies
+         - travis_retry stack --no-terminal --install-ghc --stack-yaml=stack-$GHC_VER.yaml build --only-dependencies
+
+     - stage: dependencies
+       env: GHC_VER="8.4.3"
+       script: *dependencies
+
+     - stage: dependencies
+       env: GHC_VER="8.4.2"
+       script: *dependencies
+
+     - stage: dependencies
+       env: GHC_VER="8.2.2"
+       script: *dependencies
+
+     - stage: dependencies
+       env: GHC_VER="8.2.1"
+       script: *dependencies
+
+     - stage: test
+       env: GHC_VER="8.4.4"
+       script: &test
+         - stack --no-terminal --stack-yaml=stack-$GHC_VER.yaml install
+
+     - stage: test
+       env: GHC_VER="8.4.3"
+       script: *test
+
+     - stage: test
+       env: GHC_VER="8.4.2"
+       script: *test
+
+     - stage: test
+       env: GHC_VER="8.2.2"
+       script: *test
+
+     - stage: test
+       env: GHC_VER="8.2.1"
+       script: *test
+
+     - stage: deploy
+       env: GHC_VER="8.4.4"
+       script: &deploy
+         - mkdir -p $HOME/hie-macos
+         - cp .stack-work/install/*/*/$GHC_VER/bin/hie $HOME/hie-macos
+         - cp .stack-work/install/*/*/$GHC_VER/bin/hie-wrapper $HOME/hie-macos
+         - upx --best $HOME/hie-macos/hie
+         - upx --best $HOME/hie-macos/hie-wrapper
+         - tar czf "hie-$GHC_VER-Darwin.tar.gz" $HOME/hie-macos
+       deploy: &upload
+         provider: releases
+         api_key:
+           secure: K12xUSzK+VWpnS4gRo04rJjfi71sBi0zuMWKmAcsK1igvmdbsEjyuyX4SxFI58/sM4x5qlyXg/nWSPfECKjpQS7/Q/GG1ub+AjU9kq5iyiWACWjXpDLN9Jz9iLBceyPLaf3y3rswri45v7LdwvMNwSI/wYNKEz97IfJ3VkCR16kWv/cqHGdJUYWZk7lBJX/BL94Bof4zOoXwSiy0GbaSCptcSHm1qwtN1qYsYnmihgLYR0RtLRz6tvBPHmqDjsWAXMDhaEyi0zfZ06igITkm7E4at+c3/wssYfgSg15AT2fd5T+v9keyzyanBzGh9xHYcMmflIA9dAvQawl/vw8sGsnQRaddhmTd0bqKFrtrnMO5dRsbkIyu1r178BQCJVjvy5KqyVpXy1ycDcO17E5qONVr2V838x6eg9uPJBNGR30XMg3ZF+GPsbz0xhzxf2Hhab82pJ+lAAsBlnaPdDNVchs/wjEFMp94hcL+IL4ydaXk91piPVhs3VPsLfGboQ72sUnyPUI2aiKfkk5P4Xug+2UqbX17fXfLgnkRbfyCd/4IeM4IwHgRAKa3tT7017KGSZBShihqe2dDJBjS8MlIxDD+U69HR2TIkAJaDnJe+UFAndoc8w4Ajd2OJ1/C+ey236SZq9R7D3dqyFi6Sxc1kSpNguVmjjvlEUk/Jpz1ckA=
+         file:
+           - "hie-$GHC_VER-Darwin.tar.gz"
+         skip_cleanup: true
+         draft: true
+         tag_name: "${TRAVIS_TAG}"
+         on:
+          tags: true
+
+     - stage: deploy
+       env: GHC_VER="8.4.3"
+       script: *deploy
+       deploy: *upload
+
+     - stage: deploy
+       env: GHC_VER="8.4.2"
+       script: *deploy
+       deploy: *upload
+
+     - stage: deploy
+       env: GHC_VER="8.2.2"
+       script: *deploy
+       deploy: *upload
+
+     - stage: deploy
+       env: GHC_VER="8.2.1"
+       script: *deploy
+       deploy: *upload

Changelog.md

@@ -1,3 +1,17 @@
+# 0.5.0.0
+
+ - Introduce Shakefile as build alternative (@fendor)
+ - Support GHC 8.6.3
+ - Stability improvements
+   - fixed process dying on some code action requests (#1018)
+   - Deal with missing system GHC in hie-wrapper (#1012)
+   - Deal with missing system GHC in hie
+   - Return an error diagnostic when a project cannot be built (#1011)
+ - Completion now strips out OccName prefixes added by GHC (#996)
+ - improve building on windows
+ - improve building on macos
+ - Run diagnostics on file save. It used to only do it on change.
+
 # 0.4.0.1
 
 - Install cabal / Cabal (needed for Cabal 2.4.0.1 support) via stack,