Merge branch 'master' into wip/file-versions2

Author: wz1000

.circleci/config.yml

@@ -105,9 +105,11 @@ jobs:
       - STACK_FILE: "stack-9.0.2.yaml"
     <<: *defaults
 
-  ghc-9.2.1:
+  ghc-9.2.2:
     environment:
-      - STACK_FILE: "stack-9.2.1.yaml"
+      # https://github.com/digital-asset/ghc-lib/issues/352
+      - CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
+      - STACK_FILE: "stack-9.2.yaml"
     <<: *defaults
 
   ghc-default:
@@ -126,5 +128,5 @@ workflows:
       - ghc-8.10.7
       - ghc-9.0.1
       - ghc-9.0.2
-      - ghc-9.2.1
+      - ghc-9.2.2
       - ghc-default

.github/workflows/caching.yml

@@ -80,7 +80,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ "9.2.1"
+        ghc: [ "9.2.2"
              , "9.0.2"
              , "9.0.1"
              , "8.10.7"
@@ -116,6 +116,9 @@ jobs:
         run: |
           # repeating builds to workaround segfaults in windows and ghc-8.8.4
           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
 
       # We build ghcide with benchs and test enabled to include its dependencies in the cache
       # (including shake-bench)

.github/workflows/flags.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.1"
+        ghc: [ "9.2.2"
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
@@ -72,7 +72,7 @@ jobs:
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe"
 
       # 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.1'
+      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
         name: Build with pedantic (-WError)
         run: cabal v2-build --flags="pedantic"
 

.github/workflows/test.yml

@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.1"
+        ghc: [ "9.2.2"
              , "9.0.2"
              , "9.0.1"
              , "8.10.7"
@@ -71,7 +71,7 @@ jobs:
         include:
            # only test supported ghc major versions
            - os: ubuntu-latest
-             ghc: '9.2.1'
+             ghc: '9.2.2'
              test: true
            - os: ubuntu-latest
              ghc: '9.0.2'
@@ -86,7 +86,7 @@ jobs:
              ghc: '8.6.5'
              test: true
            - os: windows-latest
-             ghc: '9.2.1'
+             ghc: '9.2.2'
              test: true
            - os: windows-latest
              ghc: '9.0.2'
@@ -115,6 +115,9 @@ jobs:
 
       # repeating builds to workaround segfaults in windows and ghc-8.8.4
       - name: Build
+        # needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
+        env:
+          CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
         run: cabal build || cabal build || cabal build
 
       - name: Set test options
@@ -125,7 +128,7 @@ jobs:
           echo "TEST_OPTS=-j1 --rerun-update --rerun-filter failures,exceptions" >> $GITHUB_ENV
 
       - name: Cache test log bewteen attempts of the same run
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-test-log
         with:
@@ -159,7 +162,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.1'
+      - if: matrix.test && matrix.ghc != '9.2.2'
         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"
 
@@ -175,19 +178,19 @@ jobs:
         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 && matrix.ghc != '9.2.1'
+      - if: matrix.test && matrix.ghc != '9.2.2'
         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.1'
+      - if: matrix.test && matrix.ghc != '9.2.2'
         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.1'
+      - if: matrix.test && matrix.ghc != '9.2.2'
         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'  && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.1'
+      - if: matrix.test && matrix.ghc != '9.0.1'  && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
         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"
 
@@ -199,7 +202,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.1'
+      - if: matrix.test && matrix.ghc != '9.2.2'
         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"
 
@@ -219,7 +222,7 @@ 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 && matrix.ghc != '9.2.1'
+      - if: matrix.test && matrix.ghc != '9.2.2'
         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"
 

.gitlab-ci.yml

@@ -19,7 +19,7 @@ variables:
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.0.2
       CABAL_PROJECT: cabal-ghc90.project
-    - GHC_VERSION: 9.2.1
+    - GHC_VERSION: 9.2.2
       CABAL_PROJECT: cabal-ghc921.project
 
 workflow:
@@ -419,8 +419,10 @@ build-x86_64-darwin:
     ADD_CABAL_ARGS: ""
   before_script:
     - /bin/bash ./.gitlab/brew.sh autoconf automake coreutils make tree
+  # CPATH https://github.com/digital-asset/ghc-lib/issues/352
   script: |
     export PATH="$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
+    export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
     /bin/bash ./.gitlab/ci.sh
   after_script:
     - rm -Rf /private/tmp/.brew_tmp
@@ -469,6 +471,7 @@ build-aarch64-darwin:
     - export HOMEBREW_CHANGE_ARCH_TO_ARM=1
     - arch -arm64 /bin/bash ./.gitlab/brew.sh llvm autoconf automake coreutils make tree
   # C_INCLUDE_PATH: https://gitlab.haskell.org/ghc/ghc/-/issues/20592
+  # CPATH https://github.com/digital-asset/ghc-lib/issues/352
   script: |
     export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
     export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang
@@ -477,6 +480,7 @@ build-aarch64-darwin:
     export AR=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ar
     export RANLIB=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ranlib
     export C_INCLUDE_PATH="`xcrun --show-sdk-path`/usr/include/ffi"
+    export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
     arch -arm64 /bin/bash ./.gitlab/ci.sh
   after_script:
     - rm -Rf /private/tmp/.brew_tmp
@@ -505,9 +509,11 @@ test-aarch64-darwin:
     - export HOMEBREW_CHANGE_ARCH_TO_ARM=1
     - arch -arm64 /bin/bash ./.gitlab/brew.sh make tree
   # C_INCLUDE_PATH: https://gitlab.haskell.org/ghc/ghc/-/issues/20592
+  # CPATH https://github.com/digital-asset/ghc-lib/issues/352
   script: |
     export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
     export C_INCLUDE_PATH="`xcrun --show-sdk-path`/usr/include/ffi"
+    export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
     arch -arm64 /bin/bash ./.gitlab/test.sh
   after_script:
     - rm -Rf /private/tmp/.brew_tmp

bindist/ghcs

@@ -1,3 +1,3 @@
 8.10.7,cabal.project
 9.0.2,cabal-ghc90.project
-9.2.1,cabal-ghc921.project
+9.2.1,cabal-ghc92.project

cabal-ghc921.project renamed to cabal-ghc92.project

@@ -29,7 +29,7 @@ packages:
          ./plugins/hls-selection-range-plugin
          ./plugins/hls-change-type-signature-plugin
 
-with-compiler: ghc-9.2.1
+with-compiler: ghc-9.2.2
 
 tests: true
 

ghcide/src/Development/IDE/GHC/Compat/Outputable.hs

@@ -164,7 +164,7 @@ type PsError = ErrMsg
 mkPrintUnqualifiedDefault :: HscEnv -> GlobalRdrEnv -> PrintUnqualified
 mkPrintUnqualifiedDefault env =
 #if MIN_VERSION_ghc(9,2,0)
-  -- GHC 9.2.1 version
+  -- GHC 9.2 version
   -- mkPrintUnqualified :: UnitEnv -> GlobalRdrEnv -> PrintUnqualified
   mkPrintUnqualified (hsc_unit_env env)
 #else

ghcide/src/Development/IDE/Spans/Pragmas.hs

@@ -5,17 +5,19 @@
 module Development.IDE.Spans.Pragmas
   ( NextPragmaInfo(..)
   , LineSplitTextEdits(..)
-  , getNextPragmaInfo ) where
+  , getNextPragmaInfo
+  , insertNewPragma ) where
 
 import           Data.Bits                       (Bits (setBit))
 import           Data.Function                   ((&))
 import qualified Data.List                       as List
 import qualified Data.Maybe                      as Maybe
-import           Data.Text                       (Text)
+import           Data.Text                       (Text, pack)
 import qualified Data.Text                       as Text
 import           Development.IDE                 (srcSpanToRange)
 import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Compat.Util
+import           GHC.LanguageExtensions.Type     (Extension)
 import qualified Language.LSP.Types              as LSP
 
 getNextPragmaInfo :: DynFlags -> Maybe Text -> NextPragmaInfo
@@ -29,6 +31,13 @@ getNextPragmaInfo dynFlags sourceText =
      | otherwise
      -> NextPragmaInfo 0 Nothing
 
+insertNewPragma :: NextPragmaInfo -> Extension -> LSP.TextEdit
+insertNewPragma (NextPragmaInfo _ (Just (LineSplitTextEdits ins _))) newPragma = ins { LSP._newText = "{-# LANGUAGE " <> pack (show newPragma) <> " #-}\n" } :: LSP.TextEdit
+insertNewPragma (NextPragmaInfo nextPragmaLine _) newPragma =  LSP.TextEdit pragmaInsertRange $ "{-# LANGUAGE " <> pack (show newPragma) <> " #-}\n"
+    where
+        pragmaInsertPosition = LSP.Position (fromIntegral nextPragmaLine) 0
+        pragmaInsertRange = LSP.Range pragmaInsertPosition pragmaInsertPosition
+
 -- Pre-declaration comments parser -----------------------------------------------------
 
 -- | Each mode represents the "strongest" thing we've seen so far.

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.1 || == 9.0.2 || == 9.2.1
+tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.2 || == 9.2.2
 extra-source-files:
   README.md
   ChangeLog.md
@@ -290,7 +290,7 @@ common splice
 
 common alternateNumberFormat
   if flag(alternateNumberFormat)
-    build-depends: hls-alternate-number-format-plugin ^>=1.0.0.0
+    build-depends: hls-alternate-number-format-plugin ^>=1.1.0.0
     cpp-options: -DalternateNumberFormat
 
 common qualifyImportedNames