hls-hlint-plugin & hls-stylish-haskell-plugin rush to ghc92

Author: July541

.github/workflows/test.yml

@@ -190,7 +190,7 @@ jobs:
         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'
+      - if: matrix.test
         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"
 
@@ -222,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.2'
+      - if: matrix.test
         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"
 

cabal-ghc90.project

@@ -37,13 +37,10 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-03-08T10:53:01Z
+index-state: 2022-04-25T10:14:27Z
 
 constraints:
-  -- These plugins don't work on GHC9 yet
-  -- Add a plugin needs remove the -flag but also update ghc bounds in hls.cabal
-  haskell-language-server +ignore-plugins-ghc-bounds -stylishhaskell,
-  ghc-lib-parser ^>= 9.0
+  hls-hlint-plugin +ghc-lib
 
 -- although we are not building all plugins cabal solver phase is run for all packages
 -- this way we track explicitly all transitive dependencies which need support for ghc-9
@@ -57,10 +54,6 @@ allow-newer:
   -- https://github.com/lspitzner/butcher/pull/8
   butcher:base,
 
-  stylish-haskell:Cabal,
-  stylish-haskell:ghc-lib-parser,
-  stylish-haskell:aeson,
-
   -- ghc-9.0.2 specific
   -- for ghcide:test via ghc-typelits-knownnat
   ghc-typelits-natnormalise:ghc-bignum

cabal-ghc92.project

@@ -39,18 +39,26 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-04-19T07:18:40Z
+index-state: 2022-04-25T10:14:27Z
 
 constraints:
   -- These plugins don't build/work on GHC92 yet
   haskell-language-server
     +ignore-plugins-ghc-bounds
     -brittany
     -haddockComments
-    -hlint
     -retrie
     -splice
     -tactic,
+  hls-hlint-plugin +ghc-lib,
+  ghc-lib-parser-ex -auto,
+  hlint +ghc-lib,
+  stylish-haskell +ghc-lib
+
+source-repository-package
+  type: git
+  location: https://github.com/July541/stylish-haskell.git
+  tag: 305168551e0fe808e0c6ba14d8245680cdd6649d
 
 allow-newer:
   -- for shake-bench
@@ -73,19 +81,6 @@ allow-newer:
   -- https://github.com/lspitzner/butcher/pull/8
   butcher:base,
 
-  ormolu:ghc-lib-parser,
-
-  fourmolu:ghc-lib-parser,
-  fourmolu:Cabal,
-
-  hls-hlint-plugin:ghc-lib,
-  hls-hlint-plugin:ghc-lib-parser,
-  hls-hlint-plugin:ghc-lib-parser-ex,
-  hlint:ghc-lib-parser,
-  hlint:ghc-lib-parser-ex,
-  -- See https://github.com/mpickering/apply-refact/pull/116
-  apply-refact:base,
-
   implicit-hie-cradle:bytestring,
   implicit-hie-cradle:time,
 
@@ -95,7 +90,8 @@ allow-newer:
   -- for ghcide:test via ghc-typelits-knownnat
   ghc-typelits-natnormalise:ghc-bignum,
 
-  hiedb:base
+  hiedb:base,
+  retrie:ghc-exactprint
 
 allow-older:
   primitive-extras:primitive-unlifted

haskell-language-server.cabal

@@ -224,7 +224,7 @@ common example-plugins
                  Ide.Plugin.Example2
 
 common class
-  if flag(class) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(class)
     build-depends: hls-class-plugin ^>= 1.0
     cpp-options: -Dclass
 
@@ -269,7 +269,7 @@ common tactic
     cpp-options: -Dtactic
 
 common hlint
-  if flag(hlint) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(hlint)
     build-depends: hls-hlint-plugin ^>= 1.0
     cpp-options: -Dhlint
 
@@ -326,7 +326,7 @@ common ormolu
     cpp-options: -Dormolu
 
 common stylishHaskell
-  if flag(stylishHaskell) && (impl(ghc < 9.0.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(stylishHaskell)
     build-depends: hls-stylish-haskell-plugin ^>= 1.0
     cpp-options: -DstylishHaskell
 

plugins/hls-class-plugin/src/Ide/Plugin/Class.hs

@@ -128,7 +128,7 @@ addMethodPlaceholders state AddMinimalMethodsParams{..} = do
         addWhere decl = decl
 
         newLine (L l e) =
-          let dp = deltaPos 1 (indent + 1) -- Not sure why there need one more space
+          let dp = deltaPos 1 indent
           in L (noAnnSrcSpanDP (locA l) dp <> l) e
 
 #else

plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal

@@ -23,7 +23,7 @@ library
   build-depends:
     , base            >=4.12 && <5
     , filepath
-    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.5
+    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6
     , ghc
     , ghc-boot-th
     , ghcide          ^>=1.7

plugins/hls-hlint-plugin/hls-hlint-plugin.cabal

@@ -43,7 +43,6 @@ library
   hs-source-dirs:     src
   build-depends:
     , aeson
-    , apply-refact          >=0.9.3.0
     , base                  >=4.12    && <5
     , binary
     , bytestring
@@ -78,21 +77,28 @@ library
     -- This mirrors the logic in hlint.cabal for hlint-3.3
     -- https://github.com/ndmitchell/hlint/blob/d3576de4529d8df6cca5a345f5b7e04474ff7bff/hlint.cabal#L79-L88
     -- so we can make sure that we do the same thing as hlint
-    build-depends: hlint ^>=3.3
+    build-depends: hlint ^>=3.4
+
     if (!flag(ghc-lib) && impl(ghc >=9.0.1) && impl(ghc <9.1.0))
-      build-depends: ghc ==9.0.*
+      build-depends: ghc          ==9.0.*
+                   , apply-refact >=0.9.0.0
+    elif (!flag(ghc-lib) && impl(ghc >=9.2.1) && impl(ghc <9.3.0))
+      build-depends: ghc          ==9.2.*
+                   , apply-refact >=0.10.0.0
     else
       build-depends:
-        , ghc
-        , ghc-lib            ^>=9.0
-        , ghc-lib-parser-ex  ^>=9.0
+        , ghc-lib            ^>=9.2
+        , ghc-lib-parser-ex  ^>=9.2
+        , ghc-lib-parser     ^>=9.2
+        , apply-refact        >=0.9.0.0
 
       cpp-options:   -DHLINT_ON_GHC_LIB
 
   else
     -- This mirrors the logic in hlint.cabal for hlint-3.2
     -- https://github.com/ndmitchell/hlint/blob/c7354e473c7d09213c8adc3dc94bf50a6eb4a42d/hlint.cabal#L79-L88
     build-depends: hlint ^>=3.2
+                 , apply-refact          >=0.9.3.0
     if (!flag(ghc-lib) && impl(ghc >=8.10.1) && impl(ghc < 8.11.0))
       build-depends: ghc >=8.10 && <9.0
     else

plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs

@@ -60,8 +60,7 @@ import qualified Refact.Apply                                       as Refact
 import qualified Refact.Types                                       as Refact
 
 #ifdef HLINT_ON_GHC_LIB
-import           Development.IDE.GHC.Compat                         (BufSpan,
-                                                                     DynFlags,
+import           Development.IDE.GHC.Compat                         (DynFlags,
                                                                      WarningFlag (Opt_WarnUnrecognisedPragmas),
                                                                      extensionFlags,
                                                                      ms_hspp_opts,
@@ -73,6 +72,7 @@ import           "ghc-lib" GHC                                      hiding
                                                                      RealSrcSpan,
                                                                      ms_hspp_opts)
 import qualified "ghc-lib" GHC
+import           "ghc-lib" GHC.Types.SrcLoc                         (BufSpan)
 import           "ghc-lib-parser" GHC.LanguageExtensions            (Extension)
 import           Language.Haskell.GhclibParserEx.GHC.Driver.Session as GhclibParserEx (readExtension)
 import           System.FilePath                                    (takeFileName)
@@ -89,7 +89,11 @@ import           System.IO.Temp
 import           Development.IDE.GHC.Compat                         hiding
                                                                     (setEnv, (<+>))
 import           GHC.Generics                                       (Associativity (LeftAssociative, NotAssociative, RightAssociative))
+#if MIN_GHC_API_VERSION(9,2,0)
+import           Language.Haskell.GHC.ExactPrint.ExactPrint         (deltaOptions)
+#else
 import           Language.Haskell.GHC.ExactPrint.Delta              (deltaOptions)
+#endif
 import           Language.Haskell.GHC.ExactPrint.Parsers            (postParseTransform)
 import           Language.Haskell.GHC.ExactPrint.Types              (Rigidity (..))
 import           Language.Haskell.GhclibParserEx.Fixity             as GhclibParserEx (applyFixities)
@@ -141,12 +145,12 @@ instance Pretty Log where
     LogApplying fp res -> "Applying hint(s) for" <+> viaShow fp <> ":" <+> viaShow res
     LogGeneratedIdeas fp ideas -> "Generated hlint ideas for for" <+> viaShow fp <> ":" <+> viaShow ideas
     LogUsingExtensions fp exts -> "Using extensions for " <+> viaShow fp <> ":" <+> pretty exts
-    LogGetIdeas fp -> "Getting hlint ideas for " <+> viaShow fp 
+    LogGetIdeas fp -> "Getting hlint ideas for " <+> viaShow fp
 
 #ifdef HLINT_ON_GHC_LIB
 -- Reimplementing this, since the one in Development.IDE.GHC.Compat isn't for ghc-lib
 pattern RealSrcSpan :: GHC.RealSrcSpan -> Maybe BufSpan -> GHC.SrcSpan
-#if MIN_VERSION_ghc(9,0,0)
+#if MIN_GHC_API_VERSION(9,0,0)
 pattern RealSrcSpan x y = GHC.RealSrcSpan x y
 #else
 pattern RealSrcSpan x y <- ((,Nothing) -> (GHC.RealSrcSpan x, y))
@@ -323,8 +327,7 @@ getExtensions nfp = do
     dflags <- getFlags
     let hscExts = EnumSet.toList (extensionFlags dflags)
     let hscExts' = mapMaybe (GhclibParserEx.readExtension . show) hscExts
-    let hlintExts = hscExts'
-    return hlintExts
+    return hscExts'
   where getFlags :: Action DynFlags
         getFlags = do
           modsum <- use_ GetModSummary nfp

plugins/hls-hlint-plugin/test/Main.hs

@@ -181,7 +181,8 @@ suggestionsTests =
         doc <- openDoc "IgnoreAnnHlint.hs" "haskell"
         expectNoMoreDiagnostics 3 doc "hlint"
 
-    , testCase "apply-refact preserve regular comments" $ runHlintSession "" $ do
+    , knownBrokenForGhcVersions [GHC92] "apply-refact has different behavior on v0.10.0.0" $
+      testCase "apply-refact preserve regular comments" $ runHlintSession "" $ do
         testRefactor "Comments.hs" "Redundant bracket" expectedComments
 
     , testCase "[#2290] apply all hints works with a trailing comment" $ runHlintSession "" $ do
@@ -358,10 +359,7 @@ disableHlint = sendConfigurationChanged $ toJSON $ def { Plugin.plugins = Map.fr
 -- Although a given hlint version supports one direct ghc, we could use several versions of hlint
 -- each one supporting a different ghc version. It should be a temporary situation though.
 knownBrokenForHlintOnGhcLib :: String -> TestTree -> TestTree
-knownBrokenForHlintOnGhcLib = knownBrokenForGhcVersions [GHC88, GHC86]
-
-knownBrokenForHlintOnRawGhc :: String -> TestTree -> TestTree
-knownBrokenForHlintOnRawGhc = knownBrokenForGhcVersions [GHC810, GHC90]
+knownBrokenForHlintOnGhcLib = knownBrokenForGhcVersions [GHC86, GHC88, GHC90, GHC92]
 
 -- 1's based
 data Point = Point {

stack-9.0.1.yaml

@@ -21,7 +21,7 @@ packages:
 - ./plugins/hls-splice-plugin
 - ./plugins/hls-tactics-plugin
 - ./plugins/hls-brittany-plugin
-# - ./plugins/hls-stylish-haskell-plugin
+- ./plugins/hls-stylish-haskell-plugin
 - ./plugins/hls-floskell-plugin
 - ./plugins/hls-fourmolu-plugin
 - ./plugins/hls-pragmas-plugin
@@ -56,6 +56,13 @@ extra-deps:
 - lsp-types-1.4.0.1
 - lsp-test-0.14.0.2
 - refinery-0.4.0.0
+- ghc-lib-9.2.2.20220307
+- ghc-lib-parser-9.2.2.20220307
+- ghc-lib-parser-ex-9.2.0.3
+- hlint-3.4
+- stylish-haskell-0.14.1.0
+- ormolu-0.4.0.0
+- fourmolu-0.6.0.0
 
 # shake-bench dependencies
 - Chart-1.9.3
@@ -65,9 +72,6 @@ extra-deps:
 - statestack-0.3
 - operational-0.2.4.1
 
-# currently needed for ghcide>extra, etc.
-allow-newer: true
-
 ghc-options:
   "$everything": -haddock
 
@@ -82,15 +86,11 @@ configure-options:
 flags:
   haskell-language-server:
     pedantic: true
-
-    ignore-plugins-ghc-bounds: true
-    stylishHaskell: false
-
   retrie:
     BuildExecutable: false
-  # Stack doesn't support automatic flags.
   hls-hlint-plugin:
     hlint33: true
+    ghc-lib: true
   hyphenation:
     embed: true
 

stack-9.0.2.yaml

@@ -21,7 +21,7 @@ packages:
 - ./plugins/hls-splice-plugin
 - ./plugins/hls-tactics-plugin
 - ./plugins/hls-brittany-plugin
-# - ./plugins/hls-stylish-haskell-plugin
+- ./plugins/hls-stylish-haskell-plugin
 - ./plugins/hls-floskell-plugin
 - ./plugins/hls-fourmolu-plugin
 - ./plugins/hls-pragmas-plugin
@@ -57,6 +57,13 @@ extra-deps:
 - lsp-types-1.4.0.1
 - lsp-test-0.14.0.2
 - unix-compat-0.5.4
+- ghc-lib-9.2.2.20220307
+- ghc-lib-parser-9.2.2.20220307
+- ghc-lib-parser-ex-9.2.0.3
+- hlint-3.4
+- stylish-haskell-0.14.1.0
+- ormolu-0.4.0.0
+- fourmolu-0.6.0.0
 
 # shake-bench dependencies
 - Chart-1.9.3
@@ -80,16 +87,13 @@ extra-deps:
 - ghc-typelits-natnormalise-0.7.6
 
 # boot libraries
-- Cabal-3.4.1.0
+- Cabal-3.6.0.0
 - directory-1.3.6.2
 - process-1.6.13.2
 - time-1.9.3
 - unix-2.7.2.2
 - Win32-2.12.0.1
 
-# currently needed for ghcide>extra, etc.
-allow-newer: true
-
 ghc-options:
   "$everything": -haddock
 
@@ -104,15 +108,12 @@ configure-options:
 flags:
   haskell-language-server:
     pedantic: true
-
-    ignore-plugins-ghc-bounds: true
-    stylishHaskell: false
-
   retrie:
     BuildExecutable: false
   # Stack doesn't support automatic flags.
   hls-hlint-plugin:
     hlint33: true
+    ghc-lib: true
   hyphenation:
     embed: true