Merge branch 'master' into qualified-completion

pepeiborra · web-flow · commit b47f9f9fcfc4 · 2022-06-19T11:49:08.000+02:00
diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml
@@ -80,11 +80,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
+             , "9.2.2"
              , "9.0.2"
-             , "9.0.1"
              , "8.10.7"
-             , "8.10.6"
              , "8.8.4"
              , "8.6.5"
              ]
@@ -118,7 +117,7 @@ jobs:
           cabal $cabalBuild || cabal $cabalBuild || cabal $cabalBuild
         env:
           # needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
-          CPATH:"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi":$CPATH
+          CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
 
       # We build ghcide with benchs and test enabled to include its dependencies in the cache
       # (including shake-bench)
diff --git a/.github/workflows/flags.yml b/.github/workflows/flags.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
@@ -68,7 +68,7 @@ jobs:
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
 
       # we have to clean up warnings for 9.0 and 9.2 before enable -WAll
-      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
+      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.3'
         name: Build with pedantic (-WError)
         run: cabal v2-build --flags="pedantic"
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -57,11 +57,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
+             , "9.2.2"
              , "9.0.2"
-             , "9.0.1"
              , "8.10.7"
-             , "8.10.6"
              , "8.8.4"
              , "8.6.5"
              ]
@@ -71,7 +70,7 @@ jobs:
         include:
            # only test supported ghc major versions
            - os: ubuntu-latest
-             ghc: '9.2.2'
+             ghc: '9.2.3'
              test: true
            - os: ubuntu-latest
              ghc: '9.0.2'
@@ -86,7 +85,7 @@ jobs:
              ghc: '8.6.5'
              test: true
            - os: windows-latest
-             ghc: '9.2.2'
+             ghc: '9.2.3'
              test: true
            - os: windows-latest
              ghc: '9.0.2'
@@ -98,12 +97,10 @@ jobs:
              ghc: '8.6.5'
              test: true
            # only build rest of supported ghc versions for windows
-           - os: windows-latest
-             ghc: '9.0.1'
-           - os: windows-latest
-             ghc: '8.10.6'
            - os: windows-latest
              ghc: '8.8.4'
+           - os: windows-latest
+             ghc: '9.2.2'
 
     steps:
       - uses: actions/checkout@v3
@@ -162,7 +159,7 @@ jobs:
           HLS_WRAPPER_TEST_EXE: hls-wrapper
         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.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         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"
 
@@ -182,11 +179,11 @@ jobs:
         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 && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         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 && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         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"
 
@@ -202,7 +199,7 @@ jobs:
         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.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         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"
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.2
       CABAL_PROJECT: cabal.project
-    - GHC_VERSION: 9.2.1
+    - GHC_VERSION: 9.2.3
       CABAL_PROJECT: cabal.project
 
 workflow:
diff --git a/bindist/ghcs b/bindist/ghcs
@@ -2,5 +2,5 @@
 8.8.4,cabal.project
 8.10.7,cabal.project
 9.0.2,cabal.project
-9.2.1,cabal.project
 9.2.2,cabal.project
+9.2.3,cabal.project
diff --git a/bindist/ghcs-Msys b/bindist/ghcs-Msys
@@ -1,4 +1,4 @@
 8.10.7,cabal.project
 9.0.2,cabal.project
 9.2.2,cabal.project
-9.2.1,cabal.project
+9.2.3,cabal.project
diff --git a/cabal.project b/cabal.project
@@ -44,7 +44,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-04-30T21:02:45Z
+index-state: 2022-06-12T00:00:00Z
 
 constraints:
   hyphenation +embed,
@@ -67,26 +67,5 @@ allow-newer:
   -- ghc-9.2
   ----------
   hiedb:base,
-  retrie:ghc-exactprint,
 
-  -- for brittany
-  -- https://github.com/lspitzner/multistate/pull/8
-  multistate:base,
-  -- https://github.com/lspitzner/data-tree-print/pull/3
-  data-tree-print:base,
-  -- https://github.com/lspitzner/butcher/pull/8
-  butcher:base,
-
-  -- for shake-bench
-  Chart:lens,
-  Chart-diagrams:lens,
-
-  -- for ekg
-  ekg-core:base,
-  ekg-core:ghc-prim,
-  ekg-wai:base,
-  ekg-wai:time,
-
-  -- for shake-bench
-  Chart-diagrams:diagrams-core,
-  SVGFonts:diagrams-core
+  ekg-wai:time
diff --git a/exe/Plugins.hs b/exe/Plugins.hs
@@ -136,7 +136,7 @@ idePlugins recorder includeExamples = pluginDescToIdePlugins allPlugins
       Floskell.descriptor "floskell" :
 #endif
 #if fourmolu
-      Fourmolu.descriptor "fourmolu" :
+      Fourmolu.descriptor pluginRecorder "fourmolu" :
 #endif
 #if tactic
       Tactic.descriptor pluginRecorder "tactics" :
diff --git a/ghcide/ghcide.cabal b/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.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1 || == 9.0.2 || == 9.2.1 || == 9.2.2
+tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2 || == 9.2.3
 extra-source-files: README.md CHANGELOG.md
                     test/data/**/*.project
                     test/data/**/*.cabal
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -14,7 +14,7 @@ copyright:          The Haskell IDE Team
 license:            Apache-2.0
 license-file:       LICENSE
 build-type:         Simple
-tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.2 || == 9.2.2
+tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2 || == 9.2.3
 extra-source-files:
   README.md
   ChangeLog.md
diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
@@ -9,21 +9,27 @@ license:            Apache-2.0
 license-file:       LICENSE
 author:             The Haskell IDE Team
 copyright:          The Haskell IDE Team
+homepage:           https://github.com/haskell/haskell-language-server
+bug-reports:        https://github.com/haskell/haskell-language-server/issues
 maintainer:         alan.zimm@gmail.com
 category:           Development
 build-type:         Simple
 extra-source-files:
   LICENSE
   test/testdata/**/*.hs
 
+source-repository head
+  type:     git
+  location: git://github.com/haskell/haskell-language-server.git
+
 library
   exposed-modules:  Ide.Plugin.Fourmolu
   hs-source-dirs:   src
   ghc-options:      -Wall
   build-depends:
     , base            >=4.12 && <5
     , filepath
-    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6
+    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7
     , ghc
     , ghc-boot-th
     , ghcide          ^>=1.7
diff --git a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs
diff --git a/plugins/hls-fourmolu-plugin/test/Main.hs b/plugins/hls-fourmolu-plugin/test/Main.hs
diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
diff --git a/stack-lts19.yaml b/stack-lts19.yaml
diff --git a/stack.yaml b/stack.yaml
