Skip to content

Commit 856be56

Browse files
committed
Fix according to review comments
1 parent 3a0a85e commit 856be56

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

exe/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ memoIO op = do
523523
Just res -> return (mp, res)
524524

525525
setOptions :: GhcMonad m => ComponentOptions -> DynFlags -> m (DynFlags, [Target])
526-
setOptions (ComponentOptions theOpts _compRoot _) dflags = do
526+
setOptions (ComponentOptions theOpts compRoot _) dflags = do
527527
cacheDir <- liftIO $ getCacheDir theOpts
528528
(dflags_, targets) <- addCmdOpts theOpts dflags
529529
let dflags' = makeDynFlagsAbsolute compRoot dflags_

src/Ide/Plugin/Example.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
125125
logInfo (ideLogger ideState) "Example.codeLens entered (ideLogger)" -- AZ
126126
case uriToFilePath' uri of
127127
Just (toNormalizedFilePath -> filePath) -> do
128-
_ <- runAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
128+
_ <- runAction "Example.codeLens" ideState $ runMaybeT $ useE TypeCheck filePath
129129
_diag <- getDiagnostics ideState
130130
_hDiag <- getHiddenDiagnostics ideState
131131
let
@@ -190,7 +190,7 @@ logAndRunRequest label getResults ide pos path = do
190190
logInfo (ideLogger ide) $
191191
label <> " request at position " <> T.pack (showPosition pos) <>
192192
" in file: " <> T.pack path
193-
runAction path ide $ getResults filePath pos
193+
runAction "Example" ide $ getResults filePath pos
194194

195195
-- ---------------------------------------------------------------------
196196

src/Ide/Plugin/Example2.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ logAndRunRequest label getResults ide pos path = do
187187
logInfo (ideLogger ide) $
188188
label <> " request at position " <> T.pack (showPosition pos) <>
189189
" in file: " <> T.pack path
190-
runAction path ide $ getResults filePath pos
190+
runAction "Example2" ide $ getResults filePath pos
191191

192192
-- ---------------------------------------------------------------------
193193

src/Ide/Plugin/Formatter.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ doFormatting lf providers ideState ft uri params = do
6464
Just provider ->
6565
case uriToFilePath uri of
6666
Just (toNormalizedFilePath -> fp) -> do
67-
(_, mb_contents) <- runAction (fromNormalizedFilePath fp) ideState $ getFileContents fp
67+
(_, mb_contents) <- runAction "Formatter" ideState $ getFileContents fp
6868
case mb_contents of
6969
Just contents -> do
7070
logDebug (ideLogger ideState) $ T.pack $

src/Ide/Plugin/Ormolu.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ provider _lf ideState typ contents fp _ = do
5959
in
6060
return $ map DynOption $ pp <> pm <> ex
6161

62-
m_parsed <- runAction (fromNormalizedFilePath fp) ideState $ getParsedModule fp
62+
m_parsed <- runAction "Ormolu" ideState $ getParsedModule fp
6363
fileOpts <- case m_parsed of
6464
Nothing -> return []
6565
Just pm -> fromDyn pm

0 commit comments

Comments
 (0)