Post-rebase fixes

Author: Jaro Reinders

ghcide/src/Development/IDE/Core/Compile.hs

@@ -190,7 +190,7 @@ typecheckModule (IdeDefer defer) hsc tc_helpers pm = do
             etcm <-
                 let
                    -- TODO: maybe setting ms_hspp_opts is unnecessary?
-                  mod_summary' = modSummary { ms_hspp_opts = hsc_dflags session}
+                  mod_summary' = modSummary { ms_hspp_opts = hsc_dflags hscEnv}
                 in
                   catchSrcErrors (hsc_dflags hscEnv) sourceTypecheck $ do
                     tcRnModule hscEnv tc_helpers $ demoteIfDefer pm{pm_mod_summary = mod_summary'}

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs

@@ -2007,7 +2007,6 @@ smallerRangesForBindingExport lies b =
       | T.unpack (printOutputable thing) == b' = []
       | otherwise =
           [ locA l' | L l' x <- inners, T.unpack (printOutputable x) == b']
-#endif
     ranges' _ = []
 
 rangesForBinding' :: String -> LIE GhcPs -> [SrcSpan]

test/functional/Config.hs

@@ -110,7 +110,7 @@ type instance RuleResult GetTestDiagnostics = ()
 
 expectDiagnosticsFail
   :: HasCallStack
-  => ExpectBroken 'Ideal [(FilePath, [(DiagnosticSeverity, Cursor, T.Text)])]
-  -> ExpectBroken 'Current [(FilePath, [(DiagnosticSeverity, Cursor, T.Text)])]
+  => ExpectBroken 'Ideal [(FilePath, [(DiagnosticSeverity, Cursor, T.Text, Maybe T.Text)])]
+  -> ExpectBroken 'Current [(FilePath, [(DiagnosticSeverity, Cursor, T.Text, Maybe T.Text)])]
   -> Session ()
 expectDiagnosticsFail _ = expectDiagnostics . unCurrent