More changes to solve stylish haskell parse errors

Author: andys8

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

@@ -132,7 +132,7 @@ import           Development.IDE.GHC.Compat             (NameCache,
                                                          knownKeyNames,
                                                          mkSplitUniqSupply)
 #if !MIN_VERSION_ghc(9,3,0)
-import           Development.IDE.GHC.Compat             ( upNameCache)
+import           Development.IDE.GHC.Compat             (upNameCache)
 #endif
 import           Development.IDE.GHC.Orphans            ()
 import           Development.IDE.Graph                  hiding (ShakeValue)

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

@@ -49,10 +49,11 @@ safeTyThingId (AConLike (RealDataCon dataCon)) = Just (dataConWrapId dataCon)
 safeTyThingId _                                = Nothing
 
 -- Possible documentation for an element in the code
-data SpanDoc
 #if MIN_VERSION_ghc(9,3,0)
+data SpanDoc
   = SpanDocString [HsDocString] SpanDocUris
 #else
+data SpanDoc
   = SpanDocString HsDocString SpanDocUris
 #endif
   | SpanDocText   [T.Text] SpanDocUris

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

@@ -1,12 +1,5 @@
 module Development.IDE.Plugin.CodeAction.Util where
 
-#if MIN_VERSION_ghc(9,2,0)
-import           GHC.Utils.Outputable
-#else
-import           Development.IDE.GHC.Util
-import           Development.IDE.GHC.Compat.Util
-import           Development.IDE.GHC.Compat
-#endif
 import           Data.Data                         (Data)
 import qualified Data.Unique                       as U
 import           Debug.Trace
@@ -18,6 +11,13 @@ import           Text.Printf
 import           Development.IDE.GHC.Dump          (showAstDataHtml)
 import           Data.Time.Clock.POSIX             (POSIXTime, getCurrentTime,
                                                     utcTimeToPOSIXSeconds)
+#if MIN_VERSION_ghc(9,2,0)
+import           GHC.Utils.Outputable
+#else
+import           Development.IDE.GHC.Util
+import           Development.IDE.GHC.Compat.Util
+import           Development.IDE.GHC.Compat
+#endif
 --------------------------------------------------------------------------------
 -- Tracing exactprint terms