Ghc 9.0.1 support for ghcide

.circleci/config.yml

@@ -103,6 +103,11 @@ jobs:
       - STACK_FILE: "stack-8.10.4.yaml"
     <<: *defaults
 
+  ghc-9.0.1:
+    environment:
+      - STACK_FILE: "stack-9.0.1.yaml"
+    <<: *defaults
+
   ghc-default:
     environment:
       - STACK_FILE: "stack.yaml"
@@ -121,4 +126,5 @@ workflows:
       - ghc-8.10.2
       - ghc-8.10.3
       - ghc-8.10.4
+      - ghc-9.0.1
       - ghc-default

.github/workflows/test.yml

@@ -33,10 +33,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
+        ghc: ["9.0.1", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
         os: [ubuntu-latest, macOS-latest]
         include:
           # only test supported ghc major versions
+          - os: ubuntu-latest
+            ghc: '9.0.1'
+            test: true
           - os: ubuntu-latest
             ghc: '8.10.4'
             test: true
@@ -70,7 +73,7 @@ jobs:
         uses: haskell/actions/setup@v1
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: "3.2"
+          cabal-version: "3.4"
 
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
         run: ./fmt.sh
@@ -88,6 +91,11 @@ jobs:
           echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
+      # Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.ghc == '9.0.1' }}
+        name: Use modified cabal.project for ghc9
+        run: cp cabal-ghc901.project cabal.project
+
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
         name: Cache Cabal
         uses: actions/cache@v2
@@ -112,7 +120,7 @@ jobs:
         run: |
           sed -i.bak -e 's/haskell-language-server/hls/g' \
                      -e 's/haskell_language_server/hls/g' \
-                     haskell-language-server.cabal
+                     haskell-language-server.cabal cabal.project
           sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
                      src/**/*.hs exe/*.hs
 
@@ -146,38 +154,38 @@ jobs:
         # instances to be spun up for the poor github actions runner to handle
         run: cabal test wrapper-test --test-options="-j1" || cabal test wrapper-test --test-options="-j1" || cabal test wrapper-test --test-options="-j1"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-brittany-plugin
         run: cabal test hls-brittany-plugin --test-options="-j1 --rerun-update" || cabal test hls-brittany-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-class-plugin
         run: cabal test hls-class-plugin --test-options="-j1 --rerun-update" || cabal test hls-class-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-eval-plugin
         run: cabal test hls-eval-plugin --test-options="-j1 --rerun-update" || cabal test hls-eval-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="-j1 --rerun"
 
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
         name: Test hls-haddock-comments-plugin
         run: cabal test hls-haddock-comments-plugin --test-options="-j1 --rerun-update" || cabal test hls-haddock-comments-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-splice-plugin
         run: cabal test hls-splice-plugin --test-options="-j1 --rerun-update" || cabal test hls-splice-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-stylish-haskell-plugin
         run: cabal test hls-stylish-haskell-plugin --test-options="-j1 --rerun-update" || cabal test hls-stylish-haskell-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-fourmolu-plugin
         run: cabal test hls-fourmolu-plugin --test-options="-j1 --rerun-update" || cabal test hls-fourmolu-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-tactics-plugin test suite
         run: cabal test hls-tactics-plugin --test-options="-j1 --rerun-update" || cabal test hls-tactics-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-refine-imports-plugin test suite
         run: cabal test hls-refine-imports-plugin --test-options="-j1 --rerun-update" || cabal test hls-refine-imports-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refine-imports-plugin --test-options="-j1 --rerun"

cabal-ghc901.project

@@ -0,0 +1,153 @@
+packages:
+         ./
+         ./hie-compat
+         ./shake-bench
+         ./hls-graph
+         ./ghcide
+         ./hls-plugin-api
+         ./hls-test-utils
+        --  ./plugins/hls-tactics-plugin
+        --  ./plugins/hls-brittany-plugin
+        --  ./plugins/hls-stylish-haskell-plugin
+        --  ./plugins/hls-fourmolu-plugin
+         ./plugins/hls-class-plugin
+         ./plugins/hls-eval-plugin
+         ./plugins/hls-explicit-imports-plugin
+         ./plugins/hls-refine-imports-plugin
+         ./plugins/hls-hlint-plugin
+         ./plugins/hls-retrie-plugin
+         ./plugins/hls-haddock-comments-plugin
+        --  ./plugins/hls-splice-plugin
+         ./plugins/hls-floskell-plugin
+         ./plugins/hls-pragmas-plugin
+         ./plugins/hls-module-name-plugin
+        --  ./plugins/hls-ormolu-plugin
+tests: true
+
+package *
+  ghc-options: -haddock
+  test-show-details: direct
+
+source-repository-package
+  type: git
+  location: https://github.com/jwaldmann/blaze-textual.git
+  tag: d8ee6cf80e27f9619d621c936bb4bda4b99a183f
+  -- https://github.com/jwaldmann/blaze-textual/commit/d8ee6cf80e27f9619d621c936bb4bda4b99a183f
+  -- https://github.com/bos/blaze-textual/issues/13
+
+source-repository-package
+  type: git
+  location: https://github.com/mithrandi/czipwith.git
+  tag: b6245884ae83e00dd2b5261762549b37390179f8
+  -- https://github.com/lspitzner/czipwith/pull/2
+
+
+source-repository-package
+  type: git
+  location: https://github.com/jneira/hie-bios/
+  tag: 9b1445ab5efcabfad54043fc9b8e50e9d8c5bbf3
+  -- https://github.com/mpickering/hie-bios/pull/285
+
+source-repository-package
+  type: git
+  location: https://github.com/hsyl20/ghc-api-compat
+  tag: 6178d75772c7d923918dfffa0b1f503dfb36d0a6
+
+source-repository-package
+  type: git
+  location: https://github.com/anka-213/th-extras
+  tag: 57a97b4df128eb7b360e8ab9c5759392de8d1659
+-- https://github.com/mokus0/th-extras/pull/8
+-- https://github.com/mokus0/th-extras/issues/7
+
+source-repository-package
+  type: git
+  location: https://github.com/anka-213/dependent-sum
+  tag: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5
+  subdir: dependent-sum-template
+-- https://github.com/obsidiansystems/dependent-sum/pull/57
+
+source-repository-package
+  type: git
+  location: https://github.com/anka-213/HieDb
+  tag: a3f7521f6c5af1b977040cce09c8f7354f8984eb
+-- https://github.com/wz1000/HieDb/pull/31
+
+source-repository-package
+  type: git
+  location: https://github.com/anka-213/lsp
+  tag: tag-ghc-9.0.1-without-pr-326
+  subdir: lsp-types
+  subdir: lsp
+  subdir: lsp-test
+-- https://github.com/haskell/lsp/pull/312
+
+source-repository-package
+  type: git
+  location: https://github.com/diagrams/active
+  tag: ca23431a8dfa013992f9164ccc882a3277361f17
+-- https://github.com/diagrams/active/pull/36
+
+write-ghc-environment-files: never
+
+index-state: 2021-05-21T05:01:41Z
+
+constraints:
+    -- Diagrams doesn't support optparse-applicative >= 0.16 yet
+    optparse-applicative < 0.16
+    -- These plugins doesn't work on GHC9 yet
+    , haskell-language-server -brittany -class -eval -fourmolu -modulename -ormolu -splice -stylishhaskell -tactic -refineImports
+
+
+allow-newer:
+    -- -- Broken on ghc9, but let's pretend it's not so we can build the other things
+    -- brittany:base,
+    -- brittany:ghc,
+    -- brittany:ghc-boot-th,
+    -- butcher:base,
+    -- fourmolu:ghc-lib-parser,
+    -- ormolu:ghc-lib-parser,
+    -- stylish-haskell:ghc-lib-parser,
+    -- stylish-haskell:Cabal,
+    -- multistate:base,
+    -- ghc-source-gen:ghc,
+
+    active:base,
+    assoc:base,
+    cryptohash-md5:base,
+    cryptohash-sha1:base,
+    constraints-extras:template-haskell,
+    data-tree-print:base,
+    deepseq:base,
+    dependent-sum:some,
+    dependent-sum:constraints,
+    diagrams-contrib:base,
+    diagrams-contrib:lens,
+    diagrams-contrib:random,
+    diagrams-core:base,
+    diagrams-core:lens,
+    diagrams-lib:base,
+    diagrams-lib:lens,
+    diagrams-postscript:base,
+    diagrams-postscript:lens,
+    diagrams-svg:base,
+    diagrams-svg:lens,
+    dual-tree:base,
+    -- Does this make any sense?
+    entropy:Cabal,
+    force-layout:base,
+    force-layout:lens,
+    floskell:ghc-prim,
+    floskell:base,
+    hashable:base,
+    hslogger:base,
+    monoid-extras:base,
+    newtype-generics:base,
+    parallel:base,
+    regex-base:base,
+    regex-tdfa:base,
+    statestack:base,
+    svg-builder:base,
+    these:base,
+    time-compat:base
+

cabal.project

@@ -32,16 +32,47 @@ write-ghc-environment-files: never
 
 index-state: 2021-05-21T05:01:41Z
 
+constraints:
+    -- Diagrams doesn't support optparse-applicative >= 0.16 yet
+    optparse-applicative < 0.16
+
 allow-newer:
-	active:base,
-  data-tree-print:base,
-	diagrams-contrib:base,
-	diagrams-core:base,
-	diagrams-lib:base,
-	diagrams-postscript:base,
-  diagrams-svg:base,
-	dual-tree:base,
-	force-layout:base,
-	monoid-extras:base,
-	statestack:base,
-	svg-builder:base
+    active:base,
+    assoc:base,
+    cryptohash-md5:base,
+    cryptohash-sha1:base,
+    constraints-extras:template-haskell,
+    data-tree-print:base,
+    deepseq:base,
+    dependent-sum:some,
+    dependent-sum:constraints,
+    diagrams-contrib:base,
+    diagrams-contrib:lens,
+    diagrams-contrib:random,
+    diagrams-core:base,
+    diagrams-core:lens,
+    diagrams-lib:base,
+    diagrams-lib:lens,
+    diagrams-postscript:base,
+    diagrams-postscript:lens,
+    diagrams-svg:base,
+    diagrams-svg:lens,
+    dual-tree:base,
+    -- Does this make any sense?
+    entropy:Cabal,
+    force-layout:base,
+    force-layout:lens,
+    floskell:ghc-prim,
+    floskell:base,
+    hashable:base,
+    hslogger:base,
+    monoid-extras:base,
+    newtype-generics:base,
+    parallel:base,
+    regex-base:base,
+    regex-tdfa:base,
+    statestack:base,
+    svg-builder:base,
+    these:base,
+    time-compat:base
+

ghcide/bench/lib/Experiments.hs

@@ -204,7 +204,7 @@ configP =
     <*> option auto (long "timeout" <> value 60 <> help "timeout for waiting for a ghcide response")
     <*> ( GetPackage <$> strOption (long "example-package-name" <> value "Cabal")
                <*> (some moduleOption <|> pure ["Distribution/Simple.hs"])
-               <*> option versionP (long "example-package-version" <> value (makeVersion [3,2,0,0]))
+               <*> option versionP (long "example-package-version" <> value (makeVersion [3,4,0,0]))
          <|>
           UsePackage <$> strOption (long "example-path")
                      <*> some moduleOption

ghcide/ghcide.cabal

@@ -13,7 +13,7 @@ description:
     A library for building Haskell IDE's on top of the GHC API.
 homepage:           https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
 bug-reports:        https://github.com/haskell/haskell-language-server/issues
-tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
+tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 9.0.1
 extra-source-files: README.md CHANGELOG.md
                     test/data/**/*.project
                     test/data/**/*.cabal
@@ -59,7 +59,7 @@ library
         hie-compat ^>= 0.1.0.0,
         hls-plugin-api ^>= 1.1.0.0,
         lens,
-        hiedb == 0.3.0.1,
+        hiedb == 0.3.0.*,
         lsp-types == 1.2.*,
         lsp == 1.2.*,
         mtl,
@@ -95,8 +95,9 @@ library
         ghc-boot-th,
         ghc-boot,
         ghc >= 8.6,
-        ghc-check >=0.5.0.1,
+        ghc-check >=0.5.0.4,
         ghc-paths,
+        ghc-api-compat,
         cryptohash-sha1 >=0.11.100 && <0.12,
         hie-bios >= 0.7.1 && < 0.8.0,
         implicit-hie-cradle >= 0.3.0.2 && < 0.4,