@@ -34,7 +34,6 @@ import Development.IDE.GHC.Compat as Compat hiding (Cpp, Warning,
34
34
import qualified Development.IDE.GHC.Compat.Util as S
35
35
import GHC.LanguageExtensions.Type (Extension (Cpp ))
36
36
import Ide.Plugin.Error
37
- import Ide.Plugin.Fourmolu.Shim
38
37
import Ide.Plugin.Properties
39
38
import Ide.PluginUtils (makeDiffTextEdit )
40
39
import Ide.Types
@@ -43,6 +42,7 @@ import Language.LSP.Protocol.Message
43
42
import Language.LSP.Protocol.Types
44
43
import Language.LSP.Server hiding (defaultConfig )
45
44
import Ormolu
45
+ import Ormolu.Config
46
46
import System.Exit
47
47
import System.FilePath
48
48
import System.Process.Run (cwd , proc )
@@ -87,9 +87,9 @@ provider recorder plId ideState typ contents fp fo = ExceptT $ withIndefinitePro
87
87
where
88
88
printerOpts = cfgFilePrinterOpts fourmoluConfig
89
89
config =
90
- addFixityOverrides (cfgFileFixities fourmoluConfig) $
91
90
defaultConfig
92
91
{ cfgDynOptions = map DynOption fileOpts
92
+ , cfgFixityOverrides = cfgFileFixities fourmoluConfig
93
93
, cfgRegion = region
94
94
, cfgDebug = False
95
95
, cfgPrinterOpts =
@@ -112,7 +112,7 @@ provider recorder plId ideState typ contents fp fo = ExceptT $ withIndefinitePro
112
112
}
113
113
throwError $ PluginInternalError errorMessage
114
114
where
115
- errorMessage = " Failed to load " <> T. pack f <> " : " <> T. pack (showParseError err)
115
+ errorMessage = " Failed to load " <> T. pack f <> " : " <> T. pack (show err)
116
116
where
117
117
fp' = fromNormalizedFilePath fp
118
118
title = " Formatting " <> T. pack (takeFileName fp')
0 commit comments