Skip to content

Commit 1f9ac76

Browse files
committed
Rebasing against mpickering/wip/use-stale-fast
At commit f9b0afb5231e07560640fa60493384e762016f46
1 parent c8ac730 commit 1f9ac76

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

exe/Main.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ main = do
195195
, optInterfaceLoadingDiagnostics = argsTesting
196196
}
197197
debouncer <- newAsyncDebouncer
198-
initialise caps (mainRule >> pluginRules plugins)
198+
fst <$> initialise caps (mainRule >> pluginRules plugins)
199199
getLspId event hlsLogger debouncer options vfs
200200
else do
201201
-- GHC produces messages with UTF8 in them, so make sure the terminal doesn't error
@@ -219,7 +219,7 @@ main = do
219219
putStrLn "\nStep 3/6: Initializing the IDE"
220220
vfs <- makeVFSHandle
221221
debouncer <- newAsyncDebouncer
222-
ide <- initialise def mainRule (pure $ IdInt 0) (showEvent lock) (logger Info) debouncer (defaultIdeOptions $ loadSession dir) vfs
222+
(ide, _worker) <- initialise def mainRule (pure $ IdInt 0) (showEvent lock) (logger Info) debouncer (defaultIdeOptions $ loadSession dir) vfs
223223

224224
putStrLn "\nStep 4/6: Type checking the files"
225225
setFilesOfInterest ide $ HashSet.fromList $ map toNormalizedFilePath' files

src/Ide/Plugin/Example.hs

Lines changed: 1 addition & 1 deletion
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 "Example.codeLens" ideState $ runMaybeT $ useE TypeCheck filePath
128+
_ <- runIdeAction "Example.codeLens" ideState $ runMaybeT $ useE TypeCheck filePath
129129
_diag <- getDiagnostics ideState
130130
_hDiag <- getHiddenDiagnostics ideState
131131
let

src/Ide/Plugin/Example2.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
125125
logInfo (ideLogger ideState) "Example2.codeLens entered (ideLogger)" -- AZ
126126
case uriToFilePath' uri of
127127
Just (toNormalizedFilePath -> filePath) -> do
128-
_ <- runAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
128+
_ <- runIdeAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
129129
_diag <- getDiagnostics ideState
130130
_hDiag <- getHiddenDiagnostics ideState
131131
let

0 commit comments

Comments
 (0)