Merge branch 'master' into fix-3847

haskell · Nov 8, 2023 · 5612811 · 5612811
2 parents dd75a97 + 0f9be3e
commit 5612811
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 24 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -21,7 +21,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"

diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml
@@ -62,7 +62,7 @@ jobs:
       - id: ghcs
         run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '["**/docs/**"

diff --git a/.github/workflows/flags.yml b/.github/workflows/flags.yml
@@ -26,7 +26,7 @@ jobs:
       - id: ghcs
         run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -21,7 +21,7 @@ jobs:
       should_skip_build: ${{ steps.skip_check_no_nix.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -36,7 +36,7 @@ jobs:
                          , ".gitlab/**"
                          ]'
       - id: skip_check_no_nix
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths: '[ "**.nix" ]'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
       - id: ghcs
         run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -45,7 +45,7 @@ jobs:
                          ]'
       # If we only change ghcide downstream packages we have not test ghcide itself
       - id: skip_ghcide_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "hls-test-utils/**"

diff --git a/ghcide/session-loader/Development/IDE/Session.hs b/ghcide/session-loader/Development/IDE/Session.hs
@@ -268,7 +268,7 @@ loadWithImplicitCradle mHieYaml rootDir = do
 
 getInitialGhcLibDirDefault :: Recorder (WithPriority Log) -> FilePath -> IO (Maybe LibDir)
 getInitialGhcLibDirDefault recorder rootDir = do
-  hieYaml <- findCradle def rootDir
+  hieYaml <- findCradle def (rootDir </> "a")
   cradle <- loadCradle def hieYaml rootDir
   libDirRes <- getRuntimeGhcLibDir (toCologActionWithPrio (cmapWithPrio LogHieBios recorder)) cradle
   case libDirRes of

diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs
@@ -618,6 +618,7 @@ runSessionWithServer' plugins conf sconf caps root s =  withLock lock $ keepCurr
                 , argsDefaultHlsConfig = conf
                 , argsLogger = argsLogger
                 , argsIdeOptions = ideOptions
+                , argsProjectRoot = Just root
                 }
 
     x <- runSessionWithHandles inW outR sconf' caps root s

diff --git a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs
@@ -1,29 +1,26 @@
-{-# LANGUAGE CPP                      #-}
-{-# LANGUAGE DataKinds                #-}
-{-# LANGUAGE DisambiguateRecordFields #-}
-{-# LANGUAGE LambdaCase               #-}
-{-# LANGUAGE NamedFieldPuns           #-}
-{-# LANGUAGE OverloadedLabels         #-}
-{-# LANGUAGE OverloadedStrings        #-}
-{-# LANGUAGE RecordWildCards          #-}
-{-# LANGUAGE TypeApplications         #-}
-{-# LANGUAGE TypeOperators            #-}
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE LambdaCase        #-}
+{-# LANGUAGE NamedFieldPuns    #-}
+{-# LANGUAGE OverloadedLabels  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE TypeApplications  #-}
+{-# LANGUAGE TypeOperators     #-}
 
 module Ide.Plugin.Fourmolu (
     descriptor,
     provider,
     LogEvent,
 ) where
 
-import           Control.Exception               (IOException, handle, try)
+import           Control.Exception
 import           Control.Lens                    ((^.))
 import           Control.Monad                   (guard)
 import           Control.Monad.Error.Class       (MonadError (throwError))
-import           Control.Monad.Trans.Except      (ExceptT (..), mapExceptT,
-                                                  runExceptT)
-
 import           Control.Monad.IO.Class          (MonadIO (liftIO))
 import           Control.Monad.Trans.Class       (MonadTrans (lift))
+import           Control.Monad.Trans.Except      (ExceptT (..), runExceptT)
 import           Data.Bifunctor                  (bimap)
 import           Data.List                       (intercalate)
 import           Data.Maybe                      (catMaybes)
@@ -96,6 +93,9 @@ provider recorder plId ideState typ contents fp fo = ExceptT $ withIndefinitePro
                         errorMessage = "Failed to load " <> T.pack f <> ": " <> T.pack (show err)
 
             let config =
+#if MIN_VERSION_fourmolu(0,13,0)
+                    refineConfig ModuleSource Nothing Nothing Nothing
+#endif
                     defaultConfig
                         { cfgDynOptions = map DynOption fileOpts
                         , cfgFixityOverrides = cfgFileFixities

diff --git a/plugins/hls-fourmolu-plugin/test/Main.hs b/plugins/hls-fourmolu-plugin/test/Main.hs
@@ -4,6 +4,7 @@ module Main
   ) where
 
 import           Data.Aeson
+import qualified Data.Aeson.KeyMap           as KM
 import           Data.Functor
 import           Ide.Plugin.Config
 import qualified Ide.Plugin.Fourmolu         as Fourmolu
@@ -28,12 +29,14 @@ tests =
             formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
         , goldenWithFourmolu cli "formats imports correctly" "Fourmolu2" "formatted" $ \doc -> do
             formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
+        , goldenWithFourmolu cli "uses correct operator fixities" "Fourmolu3" "formatted" $ \doc -> do
+            formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
         ]
 
 goldenWithFourmolu :: Bool -> TestName -> FilePath -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
 goldenWithFourmolu cli title path desc = goldenWithHaskellDocFormatter def fourmoluPlugin "fourmolu" conf title testDataDir path desc "hs"
  where
-  conf = def{plcConfig = (\(Object obj) -> obj) $ object ["external" .= cli]}
+  conf = def{plcConfig = KM.fromList ["external" .= cli]}
 
 testDataDir :: FilePath
 testDataDir = "test" </> "testdata"
diff --git a/plugins/hls-fourmolu-plugin/test/testdata/Fourmolu3.formatted.hs b/plugins/hls-fourmolu-plugin/test/testdata/Fourmolu3.formatted.hs
@@ -0,0 +1,7 @@
+b :: Bool
+b =
+    id $
+        id $
+            case True && True of
+                True -> True
+                False -> False
diff --git a/plugins/hls-fourmolu-plugin/test/testdata/Fourmolu3.hs b/plugins/hls-fourmolu-plugin/test/testdata/Fourmolu3.hs
@@ -0,0 +1,6 @@
+b :: Bool
+b =
+    id $ id $
+        case True && True of
+            True -> True
+            False -> False
diff --git a/src/Ide/Main.hs b/src/Ide/Main.hs
@@ -90,7 +90,7 @@ defaultMain recorder args idePlugins = do
 
         BiosMode PrintCradleType -> do
             dir <- IO.getCurrentDirectory
-            hieYaml <- Session.findCradle def dir
+            hieYaml <- Session.findCradle def (dir </> "a")
             cradle <- Session.loadCradle def hieYaml dir
             print cradle