Remove CPP directives supporting GHC 8.4

Author: fendor

haskell-language-server.cabal

@@ -57,7 +57,7 @@ library
   hs-source-dirs:
       src
   build-depends:
-      base >=4.7 && <5
+      base >=4.12 && <5
     , aeson
     , binary
     , bytestring
@@ -66,7 +66,7 @@ library
     , containers
     , data-default
     , deepseq
-    , Diff 
+    , Diff
     , directory
     , extra
     , filepath
@@ -79,6 +79,7 @@ library
     , hie-bios >= 0.4
     , hslogger
     , lens
+    , ormolu ^>= 0.0.5.0
     , optparse-simple
     , process
     , regex-tdfa >= 1.3.1.0
@@ -96,9 +97,6 @@ library
     exposed-modules:
       Ide.Plugin.Brittany
 
-  if impl(ghc >= 8.6)
-     build-depends: ormolu ^>= 0.0.5
-
   ghc-options:
          -Wall
          -Wredundant-constraints

src/Ide/Plugin/Formatter.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}

src/Ide/Plugin/Ormolu.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
@@ -46,7 +45,6 @@ descriptor plId = PluginDescriptor
 -- ---------------------------------------------------------------------
 
 provider :: FormattingProvider IO
-#if __GLASGOW_HASKELL__ >= 806
 provider _lf ideState typ contents fp _ = do
   let
     fromDyn :: ParsedModule -> IO [DynOption]
@@ -86,7 +84,3 @@ provider _lf ideState typ contents fp _ = do
   ret (Left err) = Left
     (responseError (T.pack $ "ormoluCmd: " ++ show err) )
   ret (Right new) = Right (makeDiffTextEdit contents new)
-
-#else
-provider _ _ _ _ = return $ Right [] -- NOP formatter
-#endif