Skip to content

Commit

Permalink
Update to current state of progress reporting in LSP (digital-asset#3211
Browse files Browse the repository at this point in the history 
)

* Update to current state of progress reporting in LSP

* fix ide-debug-driver

* Fix tests

* Fix build of ghcide executable
  • Loading branch information
@cocreature
cocreature authored Oct 17, 2019
1 parent e31526c commit 3671971
Show file tree
Hide file tree
Showing 21 changed files with 91 additions and 72 deletions.
1 change: 1 addition & 0 deletions 3rdparty/haskell/BUILD.ghcide
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ haskell_binary(
hazel_library("ghc-paths"),
hazel_library("ghc"),
hazel_library("haskell-lsp"),
hazel_library("haskell-lsp-types"),
hazel_library("hie-bios"),
hazel_library("optparse-applicative"),
hazel_library("shake"),
Expand Down
12 changes: 6 additions & 6 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,9 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
# For the time being we build with GMP. See https://github.com/digital-asset/daml/issues/106
use_integer_simple = not is_windows

HASKELL_LSP_COMMIT = "5d1dfe82c9955d81cc0e0bb7a3e8bf6d2c4c42e4"
HASKELL_LSP_COMMIT = "fefcae8b44aaf7658e0f90d5530832efe0b32053"

HASKELL_LSP_HASH = "c8b93dc2692bca5162278c783d8cc5011a118a726e7df3f2632f3f0d480455c1"
HASKELL_LSP_HASH = "410af26154494735694ae323b3431d6a6ccb49ab6f028b56656039b5662de7d6"

GRPC_HASKELL_COMMIT = "11681ec6b99add18a8d1315f202634aea343d146"

Expand Down Expand Up @@ -605,10 +605,10 @@ hazel_repositories(
# Hazel does not handle that for now, so we patch the cabal file
# to add an explicit dependency on haskell-lsp-types.
hazel_github_external(
"bubba",
"digital-asset",
"lsp-test",
"d126623dc6895d325e3d204d74e2a22d4f515587",
"214848612d319bbded67341c51fd151d65cc80264b9cfe70755ef6941b450ec9",
"40da0529edb687864acf2716dff310d38b0641c6",
"b72566fe58906ca9bf35ad340db46f0ad140e502352af028ed8a1e39a5047823",
patch_args = ["-p1"],
patches = ["@com_github_digital_asset_daml//bazel_tools:haskell-lsp-test-no-reexport.patch"],
) + hazel_github_external(
Expand Down Expand Up @@ -685,7 +685,7 @@ hazel_custom_package_github(
strip_prefix = "wai-app-static",
)

GHCIDE_REV = "2a67821e608a95a660af7414fdcfa8cd907576e8"
GHCIDE_REV = "5febbcbc48c7d7d4fdc8902718cecf0a2c49cc8e"

# We need a custom build file to depend on ghc-lib and ghc-lib-parser
hazel_custom_package_github(
Expand Down
2 changes: 1 addition & 1 deletion bazel_tools/haskell-lsp-test-no-reexport.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index 1c8350a..4d96585 100644
@@ -37,6 +37,7 @@ library
default-language: Haskell2010
build-depends: base >= 4.10 && < 5
, haskell-lsp == 0.15.*
, haskell-lsp == 0.16.*
+ , haskell-lsp-types
, aeson
, aeson-pretty
Expand Down
8 changes: 4 additions & 4 deletions compiler/daml-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,17 @@
"build": "node ./node_modules/typescript/bin/tsc -p ./"
},
"dependencies": {
"vscode-languageclient": "5.3.0-next.6",
"vscode-languageclient": "6.0.0-next.1",
"which": "1.3.1",
"tmp": "0.0.29",
"@types/tmp": "0.0.29",
"@types/which": "1.3.1"
},
"devDependencies": {
"@bazel/hide-bazel-files": "0.32.2",
"typescript": "3.3.3",
"@types/node": "6.0.42",
"typescript": "3.6.3",
"@types/node": "12.7.11",
"@types/vscode": "1.33",
"vsce": "1.65.0"
"vsce": "1.66.0"
}
}
71 changes: 38 additions & 33 deletions compiler/daml-extension/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.2.tgz#a5ccec6abb6060d5f20d256fb03ed743e9774999"
integrity sha512-gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ==

"@types/node@6.0.42":
version "6.0.42"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.42.tgz#fc6d167399a4022b396e59a2c66166d3820e5688"
integrity sha1-/G0Wc5mkAis5blmixmFm04IOVog=
"@types/node@12.7.11":
version "12.7.11"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.11.tgz#be879b52031cfb5d295b047f5462d8ef1a716446"
integrity sha512-Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==

"@types/tmp@0.0.29":
version "0.0.29"
Expand Down Expand Up @@ -379,11 +379,16 @@ safe-buffer@~5.1.0:
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

semver@^5.1.0, semver@^5.5.0:
semver@^5.1.0:
version "5.7.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==

semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
Expand Down Expand Up @@ -423,10 +428,10 @@ typed-rest-client@1.2.0:
tunnel "0.0.4"
underscore "1.8.3"

typescript@3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3.tgz#f1657fc7daa27e1a8930758ace9ae8da31403221"
integrity sha512-Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A==
typescript@3.6.3:
version "3.6.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==

uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
Expand All @@ -448,10 +453,10 @@ util-deprecate@^1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

vsce@1.65.0:
version "1.65.0"
resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.65.0.tgz#8aa4ef92fdd7f57495e074e54caea404ed29ccb2"
integrity sha512-1bGyeoaxjhNVz9fVAqUzGWc1e5CxsxZFpVSnS/anRVyZju0y4DJCPi685WkBsRYU/lfp3AI1smpatuSfb2Lllg==
vsce@1.66.0:
version "1.66.0"
resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.66.0.tgz#8cf1d64a4825d5d0523ea5efd0bf41e2c6829565"
integrity sha512-Zf4+WD4PhEcOr7jkU08SI9lwFqDhmhk73YOCGQ/tNLaBy+PnnX4eSdqj9LdzDLuI2dsyomJLXzDSNgxuaInxCQ==
dependencies:
azure-devops-node-api "^7.2.0"
chalk "^2.4.2"
Expand All @@ -474,31 +479,31 @@ vsce@1.65.0:
yauzl "^2.3.1"
yazl "^2.2.2"

vscode-jsonrpc@^4.1.0-next.2:
version "4.1.0-next.2"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz#3bd318910a48e631742b290975386e3dae685be3"
integrity sha512-GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg==
vscode-jsonrpc@^5.0.0-next.2:
version "5.0.0-next.2"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0-next.2.tgz#a44bc03f67069e53f8d8beb88b96c0cacbfefbca"
integrity sha512-Q3/jabZUNviCG9hhF6hHWjhrABevPF9mv0aiE2j8BYCAP2k+aHTpjMyk+04MzaAqWYwXdQuZkLSbcYCCqbzJLg==

vscode-languageclient@5.3.0-next.6:
version "5.3.0-next.6"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.3.0-next.6.tgz#35e74882781158e8b111911c0953869d3df08777"
integrity sha512-DxT8+gkenjCjJV6ArcP75/AQfx6HP6m6kHIbacPCpffMeoE1YMLKj6ZixA9J87yr0fMtBmqumLmDeGe7MIF2bw==
vscode-languageclient@6.0.0-next.1:
version "6.0.0-next.1"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.0.0-next.1.tgz#deca1743afd20da092e04e40ef73cedbbd978455"
integrity sha512-eJ9VjLFNINArgRzLbQ11YlWry7dM93GEODkQBXTRfrSypksiO9qSGr4SHhWgxxP26p4FRSpzc/17+N+Egnnchg==
dependencies:
semver "^5.5.0"
vscode-languageserver-protocol "^3.15.0-next.6"
semver "^6.3.0"
vscode-languageserver-protocol "^3.15.0-next.9"

vscode-languageserver-protocol@^3.15.0-next.6:
version "3.15.0-next.6"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz#a8aeb7e7dd65da8216b386db59494cdfd3215d92"
integrity sha512-/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ==
vscode-languageserver-protocol@^3.15.0-next.9:
version "3.15.0-next.9"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.9.tgz#e768256bd5b580b25bfbc8099bc03bc4c42ebf30"
integrity sha512-b9PAxouMmtsLEe8ZjbIMPb7wRWPhckGfgjwZLmp/dWnaAuRPYtY3lGO0/rNbLc3jKIqCVlnEyYVFKalzDAzj0g==
dependencies:
vscode-jsonrpc "^4.1.0-next.2"
vscode-languageserver-types "^3.15.0-next.2"
vscode-jsonrpc "^5.0.0-next.2"
vscode-languageserver-types "^3.15.0-next.5"

vscode-languageserver-types@^3.15.0-next.2:
version "3.15.0-next.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz#a0601332cdaafac21931f497bb080cfb8d73f254"
integrity sha512-2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ==
vscode-languageserver-types@^3.15.0-next.5:
version "3.15.0-next.5"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.5.tgz#863d711bf47b338ff5e63ae19fb20d4fcd4d713b"
integrity sha512-7hrELhTeWieUgex3+6692KjCkcmO/+V/bFItM5MHGcBotzwmjEuXjapLLYTYhIspuJ1ibRSik5MhX5YwLpsPiw==

which@1.3.1:
version "1.3.1"
Expand Down
1 change: 1 addition & 0 deletions compiler/damlc/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ da_haskell_library(
"ghcide",
"gitrev",
"haskell-lsp",
"haskell-lsp-types",
"lens-aeson",
"lens",
"memory",
Expand Down
1 change: 1 addition & 0 deletions compiler/damlc/daml-doc/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ da_haskell_library(
"ghcide",
"hashable",
"haskell-lsp",
"haskell-lsp-types",
"mtl",
"network-uri",
"prettyprinter",
Expand Down
3 changes: 2 additions & 1 deletion compiler/damlc/daml-doc/src/DA/Daml/Doc/Extract.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import qualified Development.IDE.Core.OfInterest as Service
import Development.IDE.Types.Logger
import Development.IDE.Types.Location
import qualified Language.Haskell.LSP.Messages as LSP
import qualified Language.Haskell.LSP.Types as LSP

import "ghc-lib" GHC
import "ghc-lib-parser" Module
Expand Down Expand Up @@ -232,7 +233,7 @@ haddockParse :: (LSP.FromServerMessage -> IO ()) ->
MaybeT IO [Service.TcModuleResult]
haddockParse diagsLogger opts f = MaybeT $ do
vfs <- makeVFSHandle
service <- Service.initialise Service.mainRule diagsLogger noLogging opts vfs
service <- Service.initialise Service.mainRule (pure $ LSP.IdInt 0) diagsLogger noLogging opts vfs
Service.setFilesOfInterest service (Set.fromList f)
Service.runAction service $
runMaybeT $
Expand Down
5 changes: 4 additions & 1 deletion compiler/damlc/daml-ide-core/src/Development/IDE/Core/Service/Daml.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import Development.IDE.Core.Shake
import Development.IDE.Types.Location
import Development.IDE.Types.Options
import qualified Language.Haskell.LSP.Messages as LSP
import qualified Language.Haskell.LSP.Types as LSP

import DA.Daml.Options.Types
import qualified DA.Daml.LF.Ast as LF
Expand Down Expand Up @@ -100,16 +101,18 @@ modifyOpenVirtualResources state f = do

initialise
:: Rules ()
-> IO LSP.LspId
-> (LSP.FromServerMessage -> IO ())
-> Logger
-> DamlEnv
-> IdeOptions
-> VFSHandle
-> IO IdeState
initialise mainRule toDiags logger damlEnv options vfs =
initialise mainRule getLspId toDiags logger damlEnv options vfs =
IDE.initialise
(do addIdeGlobal damlEnv
mainRule)
getLspId
toDiags
logger
options
Expand Down
2 changes: 1 addition & 1 deletion compiler/damlc/daml-ide-core/test/Development/IDE/State/API/Testing.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ runShakeTest mbScenarioService (ShakeTest m) = do
eventLogger _ = pure ()
vfs <- API.makeVFSHandle
damlEnv <- mkDamlEnv options mbScenarioService
service <- API.initialise (mainRule options) (atomically . eventLogger) noLogging damlEnv (toCompileOpts options (IdeReportProgress False)) vfs
service <- API.initialise (mainRule options) (pure $ IdInt 0) (atomically . eventLogger) noLogging damlEnv (toCompileOpts options (IdeReportProgress False)) vfs
result <- withSystemTempDirectory "shake-api-test" $ \testDirPath -> do
let ste = ShakeTestEnv
{ steService = service
Expand Down
3 changes: 2 additions & 1 deletion compiler/damlc/daml-ide/src/DA/Daml/LanguageServer.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import qualified Network.URI as URI

import Language.Haskell.LSP.Messages
import qualified Language.Haskell.LSP.Core as LSP
import qualified Language.Haskell.LSP.Types as LSP


textShow :: Show a => a -> T.Text
Expand Down Expand Up @@ -99,7 +100,7 @@ withUriDaml _ _ = return ()
------------------------------------------------------------------------

runLanguageServer
:: ((FromServerMessage -> IO ()) -> VFSHandle -> ClientCapabilities -> IO IdeState)
:: (IO LSP.LspId -> (FromServerMessage -> IO ()) -> VFSHandle -> ClientCapabilities -> IO IdeState)
-> IO ()
runLanguageServer getIdeState = do
let handlers = setHandlersKeepAlive <> setHandlersVirtualResource <> setHandlersCodeLens <> setIgnoreOptionalHandlers <> setCommandHandler
Expand Down
2 changes: 1 addition & 1 deletion compiler/damlc/daml-ide/src/DA/Daml/LanguageServer/CodeLens.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ handle
:: IdeState
-> CodeLensParams
-> IO (List CodeLens)
handle ide (CodeLensParams (TextDocumentIdentifier uri)) = do
handle ide (CodeLensParams (TextDocumentIdentifier uri) _) = do
mbResult <- case uriToFilePath' uri of
Just (toNormalizedFilePath -> filePath) -> do
logInfo (ideLogger ide) $ "CodeLens request for file: " <> T.pack (fromNormalizedFilePath filePath)
Expand Down
4 changes: 2 additions & 2 deletions compiler/damlc/daml-ide/src/DA/Daml/LanguageServer/Visualize.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ onCommand
-> ExecuteCommandParams
-> IO Aeson.Value
onCommand ide execParsms = case execParsms of
ExecuteCommandParams "daml/damlVisualize" (Just _arguments) -> do
ExecuteCommandParams "daml/damlVisualize" (Just _arguments) _ -> do
case collectTexts _arguments of
Just mod -> do
logInfo (ideLogger ide) "Generating visualization for current daml project"
Expand All @@ -46,7 +46,7 @@ onCommand ide execParsms = case execParsms of
Nothing -> do
logError (ideLogger ide) "Expected a single module to visualize, got multiple module"
return $ Aeson.String "Expected a single module to visualize, got multiple module"
ExecuteCommandParams command args -> do
ExecuteCommandParams command args _ -> do
logError (ideLogger ide) $ T.pack ("Unsupported command " ++ show command ++ "with args " ++ show args)
return Aeson.Null

Expand Down
22 changes: 11 additions & 11 deletions compiler/damlc/ide-debug-driver/src/IdeDebugDriver.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,19 @@ runSession (Verbose verbose) SessionConfig{..} =
where cnf = LSP.defaultConfig { LSP.logStdErr = verbose, LSP.logMessages = verbose }
fullCaps' = LSP.fullCaps { _window = Just $ WindowClientCapabilities $ Just True }

progressStart :: LSP.Session ProgressStartNotification
progressStart :: LSP.Session WorkDoneProgressBeginNotification
progressStart = do
NotProgressStart msg <- LSP.satisfy $ \case
NotProgressStart _ -> True
_ -> False
pure msg
NotWorkDoneProgressBegin not <- LSP.satisfy $ \case
NotWorkDoneProgressBegin _ -> True
_ -> False
pure not

progressDone :: LSP.Session ProgressDoneNotification
progressDone :: LSP.Session WorkDoneProgressEndNotification
progressDone = do
NotProgressDone msg <- LSP.satisfy $ \case
NotProgressDone _ -> True
_ -> False
pure msg
NotWorkDoneProgressEnd not <- LSP.satisfy $ \case
NotWorkDoneProgressEnd _ -> True
_ -> False
pure not

interpretCommand :: Command -> LSP.Session ()
interpretCommand = \case
Expand All @@ -107,7 +107,7 @@ interpretCommand = \case
start <- progressStart
skipManyTill LSP.anyMessage $ do
done <- progressDone
guard $ done ^. params . LSP.id == start ^. params . LSP.id
guard $ done ^. params . LSP.token == start ^. params . LSP.token
Repeat count cmds -> replicateM_ count $ traverse_ interpretCommand cmds
InsertLine f l t -> do
uri <- LSP.getDocUri f
Expand Down
4 changes: 2 additions & 2 deletions compiler/damlc/lib/DA/Cli/Damlc.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ execIde telemetry (Debug debug) enableScenarioService ghcOpts mbProfileDir (from
withScenarioService' enableScenarioService loggerH scenarioServiceConfig $ \mbScenarioService -> do
sdkVersion <- getSdkVersion `catchIO` const (pure "Unknown (not started via the assistant)")
Logger.logInfo loggerH (T.pack $ "SDK version: " <> sdkVersion)
runLanguageServer $ \sendMsg vfs caps ->
getDamlIdeState opts mbScenarioService loggerH sendMsg vfs (clientSupportsProgress caps)
runLanguageServer $ \getLspId sendMsg vfs caps ->
getDamlIdeState opts mbScenarioService loggerH getLspId sendMsg vfs (clientSupportsProgress caps)


execCompile :: FilePath -> FilePath -> Options -> Maybe FilePath -> Command
Expand Down
8 changes: 5 additions & 3 deletions compiler/damlc/lib/DA/Cli/Damlc/IdeState.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ import Development.IDE.Core.Rules.Daml
import Development.IDE.Core.API
import qualified Development.IDE.Types.Logger as IdeLogger
import Development.IDE.Types.Options
import qualified Language.Haskell.LSP.Types as LSP

getDamlIdeState
:: Options
-> Maybe Scenario.Handle
-> Logger.Handle IO
-> IO LSP.LspId
-> (LSP.FromServerMessage -> IO ())
-> VFSHandle
-> IdeReportProgress
-> IO IdeState
getDamlIdeState compilerOpts mbScenarioService loggerH eventHandler vfs reportProgress = do
getDamlIdeState compilerOpts mbScenarioService loggerH getLspId eventHandler vfs reportProgress = do
let rule = mainRule compilerOpts
damlEnv <- mkDamlEnv compilerOpts mbScenarioService
initialise rule eventHandler (toIdeLogger loggerH) damlEnv (toCompileOpts compilerOpts reportProgress) vfs
initialise rule getLspId eventHandler (toIdeLogger loggerH) damlEnv (toCompileOpts compilerOpts reportProgress) vfs

-- Wrapper for the common case where the scenario service will be started automatically (if enabled)
-- and we use the builtin VFSHandle.
Expand All @@ -47,7 +49,7 @@ withDamlIdeState opts@Options{..} loggerH eventHandler f = do
-- We only use withDamlIdeState outside of the IDE where we do not care about
-- progress reporting.
bracket
(getDamlIdeState opts mbScenarioService loggerH eventHandler vfs (IdeReportProgress False))
(getDamlIdeState opts mbScenarioService loggerH (pure $ LSP.IdInt 0) eventHandler vfs (IdeReportProgress False))
shutdown
f

Expand Down
1 change: 1 addition & 0 deletions compiler/damlc/tests/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ da_haskell_test(
"base",
"extra",
"ghcide",
"haskell-lsp-types",
"tasty",
"tasty-hunit",
"text",
Expand Down
Loading

0 comments on commit 3671971

Please sign in to comment.