Build with GHC 9.2

.github/workflows/build.yml

@@ -19,8 +19,9 @@ jobs:
       fail-fast: false
       matrix:
         ghc:
-          [ "9.0.1"
-          , '8.10.7'
+          [ "9.2.1"
+          , "9.0.1"
+          , "8.10.7"
           , "8.10.6"
           , "8.8.4"
           , "8.6.5"
@@ -56,6 +57,9 @@ jobs:
     - name: (GHC 9.0) Use modified cabal.project for GHC 9.0
       if: ${{ matrix.ghc == '9.0.1' }}
       run: cp cabal-ghc901.project cabal.project
+    - name: Use modified cabal.project for ghc9.2
+      if: ${{ matrix.ghc == '9.2.1' }}
+      run: cp cabal-ghc921.project cabal.project
 
     - name: Shorten binary names
       run: |

.github/workflows/caching.yml

@@ -76,7 +76,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ "9.0.1"
+        ghc: [ "9.2.1"
+             , "9.0.1"
              , "8.10.7"
              , "8.10.6"
              , "8.8.4"
@@ -109,20 +110,10 @@ jobs:
 
       # repeating builds to workaround segfaults in windows and ghc-8.8.4
       # This build agenda in not to have successful code,
-      # but to cache what can be cached, so step is fault tolerant & would always succeed.
-      # 2021-12-11: NOTE: Need to building all targets (build the project also), since
-      # current Cabal does not allow `all --enable-tests --enable-benchmarks --only-dependencies` combination
-
-      - if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10.7'
-        name: (For Bench workflow) Build benchmark targets
-        continue-on-error: true
-        #  Downloaded separately, to match the tested work/PR workflow guarantees
-        run: |
-          cabal $cabalBuild --enable-benchmarks || cabal $cabalBuild --enable-benchmarks || cabal $cabalBuild --enable-benchmarks
-
+      # but to cache what can be cached, so step is fault tolerant & would always succseed.
+      # 2021-12-11: NOTE: Building all targets, since
+      # current Cabal does not allow `all --enable-tests --enable-benchmarks --only-dependencies`
       - if: steps.compiled-deps.outputs.cache-hit != 'true'
-        name: Build targets; try 3 times
-        continue-on-error: true
-        # Done separately, matching the tested work/PR workflow guarantees
+        name: Build all targets; try 3 times
         run: |
-          cabal $cabalBuild --enable-test || cabal $cabalBuild --enable-test || cabal $cabalBuild --enable-test
+          cabal $cabalBuild || cabal $cabalBuild || cabal $cabalBuild

.github/workflows/test.yml

@@ -56,7 +56,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.0.1"
+        ghc: [ "9.2.1"
+             , "9.0.1"
              , "8.10.7"
              , "8.10.6"
              , "8.8.4"
@@ -66,33 +67,34 @@ jobs:
             , "macOS-latest"
             ]
         include:
-          # only test supported ghc major versions
-          - os: ubuntu-latest
-            ghc: '9.0.1'
-            test: true
-          - os: ubuntu-latest
-            ghc: '8.10.7'
-            test: true
-          - os: ubuntu-latest
-            ghc: '8.8.4'
-            test: true
-          - os: ubuntu-latest
-            ghc: '8.6.5'
-            test: true
-          - os: windows-latest
-            ghc: '9.0.1'
-            test: true
-          - os: windows-latest
-            ghc: '8.10.7'
-            test: true
-          - os: windows-latest
-            ghc: '8.6.5'
-            test: true
-          # only build rest of supported ghc versions for windows
-          - os: windows-latest
-            ghc: '8.10.6'
-          - os: windows-latest
-            ghc: '8.8.4'
+           # only test supported ghc major versions
+           - os: ubuntu-latest
+             ghc: '9.2.1'
+             test: true
+           - os: ubuntu-latest
+             ghc: '9.0.1'
+             test: true
+           - os: ubuntu-latest
+             ghc: '8.10.7'
+             test: true
+           - os: ubuntu-latest
+             ghc: '8.8.4'
+             test: true
+           - os: ubuntu-latest
+             ghc: '8.6.5'
+             test: true
+           - os: windows-latest
+             ghc: '9.2.1'
+             test: true
+           - os: windows-latest
+             ghc: '9.0.1'
+             test: true
+           - os: windows-latest
+             ghc: '8.10.7'
+             test: true
+           - os: windows-latest
+             ghc: '8.6.5'
+             test: true
 
     steps:
       - uses: actions/checkout@v2
@@ -144,47 +146,47 @@ jobs:
 
         run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS  --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS  --rerun-log-file .tasty-rerun-log-wrapper"
 
-      - if: matrix.test && matrix.ghc != '9.0.1'
+      - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.2.1'
         name: Test hls-brittany-plugin
         run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-floskell-plugin
         run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-class-plugin
         run: cabal test hls-class-plugin --test-options="$TEST_OPTS" || cabal test hls-class-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="$TEST_OPTS"
 
       - if: matrix.test
         name: Test hls-pragmas-plugin
         run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-eval-plugin
         run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-haddock-comments-plugin
         run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-splice-plugin
         run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.0.1'
+      - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.2.1'
         name: Test hls-stylish-haskell-plugin
         run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-ormolu-plugin
         run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-fourmolu-plugin
         run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.0.1' && !(matrix.os == 'ubuntu-latest' && matrix.ghc == '8.6.5')
+      - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.2.1' && !(matrix.os == 'ubuntu-latest' && matrix.ghc == '8.6.5')
         name: Test hls-tactics-plugin test suite
         run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
 
@@ -204,11 +206,11 @@ jobs:
         name: Test hls-rename-plugin test suite
         run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || cabal test hls-rename-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-rename-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-hlint-plugin test suite
         run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-alternate-number-format-plugin test suite
         run: cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS"
 

cabal-ghc921.project

@@ -11,20 +11,38 @@ packages:
         --  ./plugins/hls-stylish-haskell-plugin
         --  ./plugins/hls-fourmolu-plugin
          ./plugins/hls-class-plugin
-         ./plugins/hls-eval-plugin
+        -- ./plugins/hls-eval-plugin
          ./plugins/hls-explicit-imports-plugin
          ./plugins/hls-refine-imports-plugin
-         ./plugins/hls-hlint-plugin
+        -- ./plugins/hls-hlint-plugin
+        ./plugins/hls-rename-plugin
         -- ./plugins/hls-retrie-plugin
-         ./plugins/hls-haddock-comments-plugin
-        --  ./plugins/hls-splice-plugin
+        -- ./plugins/hls-haddock-comments-plugin
+        -- ./plugins/hls-splice-plugin
          ./plugins/hls-qualify-imported-names-plugin
-         ./plugins/hls-floskell-plugin
+        -- ./plugins/hls-floskell-plugin
          ./plugins/hls-pragmas-plugin
          ./plugins/hls-module-name-plugin
-         ./plugins/hls-ormolu-plugin
+        -- ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
-         ./plugins/hls-alternate-number-format-plugin
+        -- ./plugins/hls-alternate-number-format-plugin
+
+source-repository-package
+  type: git
+  location: https://github.com/tfausak/unix-compat
+  tag: 154c3a63f154cb49c51d5f9d13488e8119631d8a
+  -- To fix windows build
+  -- https://github.com/jacobstanley/unix-compat/pull/47
+
+repository head.hackage.ghc.haskell.org
+   url: https://ghc.gitlab.haskell.org/head.hackage/
+   secure: True
+   key-threshold: 3
+   root-keys:
+       f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
+       26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
+       7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
+
 
 with-compiler: ghc-9.2.1
 
@@ -36,11 +54,38 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-12-29T12:30:08Z
+index-state: 2022-01-03T18:45:00Z
 
 constraints:
   -- These plugins doesn't work on GHC92 yet
-  haskell-language-server +ignore-plugins-ghc-bounds -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports -callhierarchy -retrie
+  haskell-language-server
+    +ignore-plugins-ghc-bounds
+    -alternateNumberFormat
+    -brittany
+    -callhierarchy
+    -class
+    -eval
+    -floskell
+    -fourmolu
+    -haddockComments
+    -hlint
+    -moduleName
+    -ormolu
+    -qualifyImportedNames
+    -refineImports
+    -retrie
+    -splice
+    -stylishhaskell
+    -tactic,
+  ghc-lib-parser ^>= 9.2,
+  attoparsec ^>= 0.14.3,
+  ghc-exactprint >= 1.3,
+  retrie >= 1.2,
+  direct-sqlite == 2.3.26,
+  lens >= 5.0.1,
+  primitive-unlifted ==0.1.3.1,
+  -- these constraints are for head.hackage
+  aeson ==1.5.6.0,
 
 allow-newer:
   Cabal,
@@ -62,4 +107,10 @@ allow-newer:
   dependent-sum:constraints,
   diagrams:diagrams-core,
   Chart-diagrams:diagrams-core,
-  SVGFonts:diagrams-core
+  SVGFonts:diagrams-core,
+
+  -- for head.hackage
+  primitive-unlifted:base
+
+allow-older:
+  primitive-extras:primitive-unlifted

ghcide/.hlint.yaml

@@ -114,6 +114,8 @@
     - Development.IDE.Spans.AtPoint
     - Development.IDE.Spans.Pragmas
     - Development.IDE.Plugin.CodeAction
+    - Development.IDE.Plugin.CodeAction.Args
+    - Development.IDE.Plugin.CodeAction.ExactPrint
     - Development.IDE.Plugin.Completions
     - Development.IDE.Plugin.Completions.Logic
     - Development.IDE.Types.Location

ghcide/bench/lib/Experiments.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs                     #-}
 {-# LANGUAGE ImplicitParams            #-}
 {-# LANGUAGE ImpredicativeTypes        #-}
+{-# LANGUAGE PolyKinds                 #-}
 {-# OPTIONS_GHC -Wno-deprecations -Wno-unticked-promoted-constructors #-}
 
 module Experiments
@@ -251,7 +252,7 @@ configP =
     <*> option auto (long "timeout" <> value 60 <> help "timeout for waiting for a ghcide response")
     <*> ( Example "name"
                <$> (Right <$> packageP)
-               <*> (some moduleOption <|> pure ["Distribution/Simple.hs"])
+               <*> (some moduleOption <|> pure ["src/Distribution/Simple.hs"])
                <*> pure []
          <|>
           Example "name"
@@ -263,7 +264,7 @@ configP =
 
       packageP = ExamplePackage
             <$> strOption (long "example-package-name" <> value "Cabal")
-            <*> option versionP (long "example-package-version" <> value (makeVersion [3,4,0,0]))
+            <*> option versionP (long "example-package-version" <> value (makeVersion [3,6,0,0]))
       pathP = strOption (long "example-path")
 
 versionP :: ReadM Version

ghcide/ghcide.cabal

@@ -164,6 +164,7 @@ library
         Development.IDE.GHC.Compat
         Development.IDE.GHC.Compat.Core
         Development.IDE.GHC.Compat.Env
+        Development.IDE.GHC.Compat.ExactPrint
         Development.IDE.GHC.Compat.Iface
         Development.IDE.GHC.Compat.Logger
         Development.IDE.GHC.Compat.Outputable
@@ -172,6 +173,7 @@ library
         Development.IDE.GHC.Compat.Units
         Development.IDE.GHC.Compat.Util
         Development.IDE.Core.Compile
+        Development.IDE.GHC.Dump
         Development.IDE.GHC.Error
         Development.IDE.GHC.ExactPrint
         Development.IDE.GHC.Orphans
@@ -410,7 +412,7 @@ test-suite ghcide-tests
         tasty-rerun,
         text,
         unordered-containers,
-    if (impl(ghc >= 8.6))
+    if (impl(ghc >= 8.6) && impl(ghc < 9.2))
       build-depends:
           record-dot-preprocessor,
           record-hasfield

ghcide/session-loader/Development/IDE/Session.hs

@@ -432,7 +432,7 @@ loadSessionWithOptions SessionLoadingOptions{..} dir = do
               newHscEnv <-
                 -- Add the options for the current component to the HscEnv
                 evalGhcEnv hscEnv $ do
-                  _ <- setSessionDynFlags df
+                  _ <- setSessionDynFlags $ setHomeUnitId_ fakeUid df
                   getSession
 
               -- Modify the map so the hieYaml now maps to the newly created
@@ -628,10 +628,7 @@ cradleToOptsAndLibDir logger cradle file = do
 emptyHscEnv :: IORef NameCache -> FilePath -> IO HscEnv
 emptyHscEnv nc libDir = do
     env <- runGhc (Just libDir) getSession
-    when (Compat.ghcVersion < Compat.GHC90) $
-        -- This causes ghc9 to crash with the error:
-        -- Couldn't find a target code interpreter. Try with -fexternal-interpreter
-        initDynLinker env
+    initDynLinker env
     pure $ setNameCache nc (hscSetFlags ((hsc_dflags env){useUnicode = True }) env)
 
 data TargetDetails = TargetDetails