Allow ormolu-0.5.3

Author: cydparser

plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal

@@ -32,9 +32,7 @@ library
     , hls-plugin-api  ^>=1.3 || ^>=1.4 || ^>= 1.5 || ^>= 1.6
     , lens
     , lsp
-    -- we are incompatible with 0.5.3.
-    -- See upstream ticket: https://github.com/tweag/ormolu/issues/981
-    , ormolu          ^>=0.1.2 || ^>= 0.2 || ^>= 0.3 || (>= 0.5 && < 0.5.3)
+    , ormolu          ^>=0.1.2 || ^>= 0.2 || ^>= 0.3 || ^>= 0.5
     , text
 
   default-language: Haskell2010

plugins/hls-ormolu-plugin/src/Ide/Plugin/Ormolu.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeApplications  #-}
 
@@ -45,7 +46,11 @@ provider ideState typ contents fp _ = withIndefiniteProgress title Cancellable $
     mkConf o region = defaultConfig { cfgDynOptions = o, cfgRegion = region }
     fmt :: T.Text -> Config RegionIndices -> IO (Either OrmoluException T.Text)
     fmt cont conf =
+#if MIN_VERSION_ormolu(0,5,3)
+      try @OrmoluException $ ormolu conf (fromNormalizedFilePath fp) cont
+#else
       try @OrmoluException $ ormolu conf (fromNormalizedFilePath fp) $ T.unpack cont
+#endif
 
   case typ of
     FormatText -> ret <$> fmt contents (mkConf fileOpts fullRegion)