Merge pull request #962 from alanz/merge-ghc-8.6.1

Support for GHC 8.6 and preliminary new-build

Author: alanz

.circleci/config.yml

@@ -22,9 +22,9 @@ defaults: &defaults
 
     - restore_cache:
         keys:
-          - stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
-          - stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
-          - stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
+          - 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" }}
 
     - run:
         name: Stack setup
@@ -39,9 +39,13 @@ defaults: &defaults
         command: stack --stack-yaml=${STACK_FILE} install hoogle
 
     - run:
-        name: Build
+        name: Build (we need the exe for tests)
         command: stack -j 2 --stack-yaml=${STACK_FILE} install
 
+    - run:
+        name: Build Testsuite without running it
+        command: stack -j 2 --stack-yaml=${STACK_FILE}  build --test --no-run-tests
+
     - store_artifacts:
         path: ~/.local/bin
         destination: bin
@@ -55,7 +59,7 @@ defaults: &defaults
         command: rm -fr ~/.cache/cabal-helper
 
     - save_cache:
-        key: stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
+        key: stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
         paths:
           - ~/.stack
           - ~/.cache
@@ -77,7 +81,7 @@ defaults: &defaults
         path: test-logs
 
     - save_cache:
-        key: stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
+        key: stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
         paths:
           - ~/.stack
           - ~/.cache
@@ -90,7 +94,7 @@ defaults: &defaults
           - ~/build/submodules/cabal-helper/.stack-work
 
     - save_cache:
-        key: stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
+        key: stack-cache-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
         paths:
           - ~/.stack
           - ~/.cache
@@ -134,6 +138,15 @@ jobs:
       - STACK_FILE: "stack-8.4.4.yaml"
     <<: *defaults
 
+  ghc-8.6.1:
+    environment:
+      - STACK_FILE: "stack-8.6.1.yaml"
+    <<: *defaults
+
+  ghc-8.6.2:
+    environment:
+      - STACK_FILE: "stack-8.6.2.yaml"
+    <<: *defaults
 
   ghc-nightly:
     environment:
@@ -143,7 +156,8 @@ jobs:
   cabal:
     working_directory: ~/build
     docker:
-      - image: quay.io/haskell_works/ghc-8.4.3
+      # - image: quay.io/haskell_works/ghc-8.4.3
+      - image: quay.io/haskell_works/ghc-8.6.1
     steps:
       - checkout
       - run:
@@ -154,7 +168,7 @@ jobs:
           command: git submodule update --recursive --init
       - restore-cache:
           keys:
-            - cabal-03
+            - cabal-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
       - run:
           name: Cabal version
           command: cabal --version
@@ -168,7 +182,7 @@ jobs:
           name: Build
           command: cabal new-build -j2
       - save_cache:
-          key: cabal-03
+          key: cabal-12-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
           paths:
             - ~/.cabal
 
@@ -182,5 +196,7 @@ workflows:
       - ghc-8.4.2
       - ghc-8.4.3
       - ghc-8.4.4
+      - ghc-8.6.1
+      - ghc-8.6.2
       - ghc-nightly
       - cabal

.gitignore

@@ -64,3 +64,4 @@ test-logs/
 
 .hspec-failures
 /test/testdata/addPragmas/stack.yaml
+.vscode

.gitmodules

@@ -26,4 +26,10 @@
 
 [submodule "submodules/brittany"]
 	path = submodules/brittany
-	url = https://github.com/alanz/brittany.git
+	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

Makefile

@@ -5,7 +5,9 @@ all: help
 .PHONY: all
 
 ## Builds hie for all supported GHC versions (8.2.1, 8.2.2, 8.4.2 and 8.4.3, 8.4.4)
-build: hie-8.2.1 hie-8.2.2 hie-8.4.2 hie-8.4.3 hie-8.4.4
+build: hie-8.2.1 hie-8.2.2 \
+       hie-8.4.2 hie-8.4.3 hie-8.4.4 \
+       hie-8.6.1 hie-8.6.2
 .PHONY: build
 
 ## Builds hie and hoogle databases for all supported GHC versions
@@ -15,7 +17,7 @@ build-all: build build-docs
 # ------------------------------------------------------
 
 ## Builds hie for GHC version 8.2.1 only
-hie-8.2.1: submodules
+hie-8.2.1: submodules cabal
 	stack --stack-yaml=stack-8.2.1.yaml install happy
 	stack --stack-yaml=stack-8.2.1.yaml build
 	stack --stack-yaml=stack-8.2.1.yaml install                                \
@@ -24,7 +26,7 @@ hie-8.2.1: submodules
 .PHONY: hie-8.2.1
 
 ## Builds hie for GHC version 8.2.2 only
-hie-8.2.2: submodules
+hie-8.2.2: submodules cabal
 	stack --stack-yaml=stack-8.2.2.yaml install happy
 	stack --stack-yaml=stack-8.2.2.yaml build
 	stack --stack-yaml=stack-8.2.2.yaml install                                \
@@ -33,63 +35,101 @@ hie-8.2.2: submodules
 .PHONY: hie-8.2.2
 
 ## Builds hie for GHC version 8.4.2 only
-hie-8.4.2: submodules
+hie-8.4.2: submodules cabal
 	stack --stack-yaml=stack-8.4.2.yaml build
 	stack --stack-yaml=stack-8.4.2.yaml install                                \
 		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.4.2'    \
 		&& cp '$(STACKLOCALBINDIR)/hie-8.4.2' '$(STACKLOCALBINDIR)/hie-8.4'
 .PHONY: hie-8.2.2
 
 ## Builds hie for GHC version 8.4.3 only
-hie-8.4.3: submodules
+hie-8.4.3: submodules cabal
 	stack --stack-yaml=stack-8.4.3.yaml build
 	stack --stack-yaml=stack-8.4.3.yaml install                                      \
 		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.4.3'    \
 		&& cp '$(STACKLOCALBINDIR)/hie-8.4.3' '$(STACKLOCALBINDIR)/hie-8.4'
 .PHONY: hie-8.4.3
 
 ## Builds hie for GHC version 8.4.4 only
-hie-8.4.4: submodules
+hie-8.4.4: submodules cabal
 	stack --stack-yaml=stack-8.4.4.yaml build
 	stack --stack-yaml=stack-8.4.4.yaml install                                      \
 		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.4.4'    \
 		&& cp '$(STACKLOCALBINDIR)/hie-8.4.4' '$(STACKLOCALBINDIR)/hie-8.4'
 .PHONY: hie-8.4.4
 
+## Builds hie for GHC version 8.6.1 only
+hie-8.6.1: submodules cabal
+	stack --stack-yaml=stack-8.6.1.yaml build
+	stack --stack-yaml=stack-8.6.1.yaml install                                      \
+		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.6.1'    \
+		&& cp '$(STACKLOCALBINDIR)/hie-8.6.1' '$(STACKLOCALBINDIR)/hie-8.4'
+.PHONY: hie-8.6.1
+
+## Builds hie for GHC version 8.6.2 only
+hie-8.6.2: submodules cabal
+	stack --stack-yaml=stack-8.6.2.yaml build
+	stack --stack-yaml=stack-8.6.2.yaml install                                      \
+		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.6.2'    \
+		&& cp '$(STACKLOCALBINDIR)/hie-8.6.2' '$(STACKLOCALBINDIR)/hie-8.4'
+.PHONY: hie-8.6.2
+
 # ------------------------------------------------------
 
 ## Updates local git submodules
 submodules:
 	git submodule update --init
 .PHONY: submodules
 
+# ------------------------------------------------------
+
+## Makes sure that Cabal the lib is available for cabal-helper-wapper,
+## to speed up project start
+
+## NOTE 1: cabal-helper-wrapper builds with old style cabal build, so
+##         must be installed this way.
+## NOTE 2: this is temporary, will go away once the new cabal-helper lands.
+## NOTE 3: This is needed for stack only projects too
+cabal:
+	cabal update
+	cabal install Cabal-2.4.1.0
+.PHONY: cabal
+
+# ------------------------------------------------------
+
 ## Builds the Hoogle database for all supported GHC versions
 build-docs:
 	stack --stack-yaml=stack-8.2.1.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.2.2.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.4.2.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.4.3.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.4.4.yaml exec hoogle generate
+	&& stack --stack-yaml=stack-8.6.1.yaml exec hoogle generate
+	&& stack --stack-yaml=stack-8.6.2.yaml exec hoogle generate
 .PHONY: build-docs
 
 
 # ------------------------------------------------------
 
 ## Runs hie tests
-test: submodules
+test: submodules cabal
 	stack --stack-yaml=stack-8.2.1.yaml test \
 	&& stack --stack-yaml=stack-8.2.2.yaml test \
 	&& stack --stack-yaml=stack-8.4.2.yaml test \
 	&& stack --stack-yaml=stack-8.4.3.yaml test \
 	&& stack --stack-yaml=stack-8.4.4.yaml test
+	&& stack --stack-yaml=stack-8.6.1.yaml test
+	&& stack --stack-yaml=stack-8.6.2.yaml test
 .PHONY: test
 
-build-copy-compiler-tool: submodules
+build-copy-compiler-tool: submodules cabal
 	stack --stack-yaml=stack-8.2.1.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.2.2.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.4.2.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.4.3.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.4.4.yaml build --copy-compiler-tool
+	&& stack --stack-yaml=stack-8.6.1.yaml build --copy-compiler-tool
+	&& stack --stack-yaml=stack-8.6.2.yaml build --copy-compiler-tool
 .PHONY: build-copy-compiler-tool
 
 ## Fixes icu related problems in MacOS
@@ -114,6 +154,12 @@ icu-macos-fix-build:
 	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
 	  --extra-include-dirs=/usr/local/opt/icu4c/include    \
 	&& stack --stack-yaml=stack-8.4.4.yaml build text-icu  \
+	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
+	  --extra-include-dirs=/usr/local/opt/icu4c/include    \
+	&& stack --stack-yaml=stack-8.6.1.yaml build text-icu  \
+	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
+	  --extra-include-dirs=/usr/local/opt/icu4c/include    \
+	&& stack --stack-yaml=stack-8.6.2.yaml build text-icu  \
 	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
 	  --extra-include-dirs=/usr/local/opt/icu4c/include
 .PHONY: icu-macos-fix-build

README.md

@@ -105,7 +105,7 @@ sudo apt install libicu-dev libtinfo-dev
 ```
 
 
-### Getting the source for GHC 8.2.1, 8.2.2, 8.4.2, 8.4.3
+### Getting the source for GHC 8.2.1 to 8.6.2
 
 HIE builds from source code, so first,
 

appveyor.yml

@@ -1,6 +1,8 @@
 version: 1.0.{build}
 environment:
   matrix:
+  - GHCVER: 8.6.2
+  - GHCVER: 8.6.1
   - GHCVER: 8.4.4
   - GHCVER: 8.4.3
   - GHCVER: 8.4.2

cabal.project

@@ -2,8 +2,12 @@ packages:
          ./
          ./hie-plugin-api/
 
-         ./submodules/brittany
          ./submodules/HaRe
+         ./submodules/brittany
+         ./submodules/cabal-helper/
          ./submodules/ghc-mod/
          ./submodules/ghc-mod/core/
-         ./submodules/cabal-helper/
+
+
+-- allow-newer:ekg-core-0.1.1.4:base
+-- allow-newer:ekg-json-0.1.0.6:base

haskell-ide-engine.cabal

@@ -309,7 +309,7 @@ test-suite func-test
                      , data-default
                      , directory
                      , filepath
-                     , lsp-test == 0.4.*
+                     , lsp-test == 0.5.*
                      , haskell-ide-engine
                      -- , hie-test-utils
                      , hie-plugin-api

hie-plugin-api/Haskell/Ide/Engine/ArtifactMap.hs

@@ -69,7 +69,19 @@ genLocMap tm = names
     checker (GHC.L (GHC.RealSrcSpan r) x) = IM.singleton (rspToInt r) x
     checker _                             = IM.empty
 
-#if __GLASGOW_HASKELL__ > 710
+#if __GLASGOW_HASKELL__ >= 806
+    fieldOcc :: GHC.FieldOcc GM.GhcRn -> LocMap
+    fieldOcc (GHC.FieldOcc n (GHC.L (GHC.RealSrcSpan r) _)) = IM.singleton (rspToInt r) n
+    fieldOcc _ = IM.empty
+
+    hsRecFieldN :: GHC.LHsExpr GM.GhcRn -> LocMap
+    hsRecFieldN (GHC.L _ (GHC.HsRecFld _ (GHC.Unambiguous n (GHC.L (GHC.RealSrcSpan r) _)) )) = IM.singleton (rspToInt r) n
+    hsRecFieldN _ = IM.empty
+
+    hsRecFieldT :: GHC.LHsExpr GM.GhcTc -> LocMap
+    hsRecFieldT (GHC.L _ (GHC.HsRecFld _ (GHC.Ambiguous n (GHC.L (GHC.RealSrcSpan r) _)) )) = IM.singleton (rspToInt r) (Var.varName n)
+    hsRecFieldT _ = IM.empty
+#elif __GLASGOW_HASKELL__ > 710
     fieldOcc :: GHC.FieldOcc GM.GhcRn -> LocMap
     fieldOcc (GHC.FieldOcc (GHC.L (GHC.RealSrcSpan r) _) n) = IM.singleton (rspToInt r) n
     fieldOcc _ = IM.empty
@@ -104,7 +116,11 @@ genImportMap tm = moduleMap
     goImp acc _ = acc
 
     goExp :: ModuleMap -> GHC.LIE name -> ModuleMap
+#if __GLASGOW_HASKELL__ >= 806
+    goExp acc (GHC.L (GHC.RealSrcSpan r) (GHC.IEModuleContents _ lmn)) =
+#else
     goExp acc (GHC.L (GHC.RealSrcSpan r) (GHC.IEModuleContents lmn)) =
+#endif
       IM.insert (rspToInt r) (GHC.unLoc lmn) acc
     goExp acc _ = acc
 
@@ -115,22 +131,43 @@ genDefMap tm = mconcat $ map (go . GHC.unLoc) decls
   where
     go :: GHC.HsDecl GM.GhcPs -> DefMap
     -- Type signatures
+#if __GLASGOW_HASKELL__ >= 806
+    go (GHC.SigD _ (GHC.TypeSig _ lns _)) =
+#else
     go (GHC.SigD (GHC.TypeSig lns _)) =
+#endif
       foldl IM.union mempty $ fmap go' lns
-      where go' (GHC.L (GHC.RealSrcSpan r) n) = IM.singleton (rspToInt r) n 
+      where go' (GHC.L (GHC.RealSrcSpan r) n) = IM.singleton (rspToInt r) n
             go' _ = mempty
     -- Definitions
+#if __GLASGOW_HASKELL__ >= 806
+    go (GHC.ValD _ (GHC.FunBind _ (GHC.L (GHC.RealSrcSpan r) n) GHC.MG { GHC.mg_alts = llms } _ _)) =
+#else
     go (GHC.ValD (GHC.FunBind (GHC.L (GHC.RealSrcSpan r) n) GHC.MG { GHC.mg_alts = llms } _ _ _)) =
+#endif
       IM.insert (rspToInt r) n wheres
       where
         wheres = mconcat $ fmap (gomatch . GHC.unLoc) (GHC.unLoc llms)
 
         gomatch GHC.Match { GHC.m_grhss = GHC.GRHSs { GHC.grhssLocalBinds = lbs } } =
             golbs (GHC.unLoc lbs)
+#if __GLASGOW_HASKELL__ >= 806
+        gomatch GHC.XMatch{} = error "GHC.XMatch"
+        gomatch (GHC.Match _ _ _ (GHC.XGRHSs _)) = error "GHC.XMatch"
+#endif
 
+#if __GLASGOW_HASKELL__ >= 806
+        golbs (GHC.HsValBinds _ (GHC.ValBinds _ lhsbs lsigs)) =
+#else
         golbs (GHC.HsValBinds (GHC.ValBindsIn lhsbs lsigs)) =
+#endif
+#if __GLASGOW_HASKELL__ >= 806
+          foldl (\acc x -> IM.union acc (go $ GHC.ValD GHC.NoExt $ GHC.unLoc x)) mempty lhsbs
+            `mappend` foldl IM.union mempty (fmap (go . GHC.SigD GHC.NoExt . GHC.unLoc) lsigs)
+#else
           foldl (\acc x -> IM.union acc (go $ GHC.ValD $ GHC.unLoc x)) mempty lhsbs
             `mappend` foldl IM.union mempty (fmap (go . GHC.SigD . GHC.unLoc) lsigs)
+#endif
         golbs _ = mempty
     go _ = mempty
     decls = GHC.hsmodDecls $ GHC.unLoc $ GHC.pm_parsed_source $ GHC.tm_parsed_module tm
@@ -168,6 +205,3 @@ toPos (l,c) = Position (l-1) (c-1)
 
 -- ---------------------------------------------------------------------
 -- ---------------------------------------------------------------------
-
-
-