Add Brittany to ghc-8.10.1

Author: lukel97

exe/Main.hs

@@ -71,7 +71,7 @@ import Ide.Plugin.Fourmolu                as Fourmolu
 import Ide.Plugin.Ormolu                  as Ormolu
 import Ide.Plugin.StylishHaskell          as StylishHaskell
 import Ide.Plugin.Retrie                  as Retrie
-#if AGPL && !MIN_VERSION_ghc(8,10,1)
+#if AGPL
 import Ide.Plugin.Brittany                as Brittany
 #endif
 import Ide.Plugin.Pragmas                 as Pragmas
@@ -110,9 +110,7 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
       , StylishHaskell.descriptor "stylish-haskell"
       , Retrie.descriptor "retrie"
 #if AGPL
-#if !MIN_VERSION_ghc(8,10,1)
       , Brittany.descriptor    "brittany"
-#endif
 #endif
       , Eval.descriptor "eval"
       ]

haskell-language-server.cabal

@@ -103,11 +103,10 @@ library
   else
     build-depends:     unix
   if flag(agpl)
-    if impl(ghc < 8.10)
-      build-depends:
-        brittany
-      exposed-modules:
-        Ide.Plugin.Brittany
+    build-depends:
+      brittany
+    exposed-modules:
+      Ide.Plugin.Brittany
 
   ghc-options:
          -Wall

test/functional/Format.hs

@@ -12,8 +12,7 @@ import Test.Tasty
 import Test.Tasty.Golden
 import Test.Tasty.HUnit
 
-#if MIN_VERSION_GLASGOW_HASKELL(8,10,0,0) || !defined(AGPL)
-#else
+#if AGPL
 import qualified Data.Text.IO as T
 #endif
 
@@ -30,9 +29,7 @@ tests = testGroup "format document" [
     , rangeTests
     , providerTests
     , stylishHaskellTests
--- There's no Brittany formatter on the 8.10.1 builds (yet)
-#if MIN_VERSION_GLASGOW_HASKELL(8,10,0,0) || !defined(AGPL)
-#else
+#if AGPL
     , brittanyTests
 #endif
     , ormoluTests
@@ -63,9 +60,7 @@ providerTests = testGroup "formatting provider" [
         formatRange doc (FormattingOptions 2 True) (Range (Position 1 0) (Position 3 10))
         documentContents doc >>= liftIO . (@?= orig)
 
--- There's no Brittany formatter on the 8.10.1 builds (yet)
-#if MIN_VERSION_GLASGOW_HASKELL(8,10,0,0) || !defined(AGPL)
-#else
+#if AGPL
     , testCase "can change on the fly" $ runSession hieCommand fullCaps "test/testdata" $ do
         formattedBrittany <- liftIO $ T.readFile "test/testdata/Format.brittany.formatted.hs"
         formattedFloskell <- liftIO $ T.readFile "test/testdata/Format.floskell.formatted.hs"
@@ -114,8 +109,7 @@ stylishHaskellTests = testGroup "stylish-haskell" [
       BS.fromStrict . T.encodeUtf8 <$> documentContents doc
   ]
 
-#if MIN_VERSION_GLASGOW_HASKELL(8,10,0,0) || !defined(AGPL)
-#else
+#if AGPL
 brittanyTests :: TestTree
 brittanyTests = testGroup "brittany" [
     goldenVsStringDiff "formats a document with LF endings" goldenGitDiff "test/testdata/BrittanyLF.formatted_document.hs" $ runSession hieCommand fullCaps "test/testdata" $ do
@@ -177,8 +171,7 @@ fourmoluTests = testGroup "fourmolu"
 formatLspConfig :: Value -> Value
 formatLspConfig provider = object [ "haskell" .= object ["formattingProvider" .= (provider :: Value)] ]
 
-#if MIN_VERSION_GLASGOW_HASKELL(8,10,0,0) || !defined(AGPL)
-#else
+#if AGPL
 -- | The same as 'formatLspConfig' but using the legacy section name
 formatLspConfigOld :: Value -> Value
 formatLspConfigOld provider = object [ "languageServerHaskell" .= object ["formattingProvider" .= (provider :: Value)] ]

test/testdata/Format.brittany.formatted.hs

@@ -11,5 +11,8 @@ bar s = do
   x <- return "hello"
   return "asdf"
 
-data Baz = Baz { a :: Int, b :: String }
+data Baz = Baz
+  { a :: Int
+  , b :: String
+  }
 

test/testdata/Format.brittany_post_floskell.formatted.hs

@@ -13,5 +13,8 @@ bar s = do
   x <- return "hello"
   return "asdf"
 
-data Baz = Baz { a :: Int, b :: String }
+data Baz = Baz
+  { a :: Int
+  , b :: String
+  }