Skip to content

Only warn when the BSP socket gets closed #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge upstream changes
merged 2 commits into from
Jan 20, 2022
Merged

Only warn when the BSP socket gets closed #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d1a4e
Only warn when the BSP socket gets closed
alexarchambault Dec 16, 2021
279dcda
Add retry around flaky test
alexarchambault Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/src/main/scala/bloop/bsp/BspServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ object BspServer {
val server = new BloopLanguageServer(messages, client, provider.services, ioScheduler, bspLogger)
// FORMAT: ON

def warn(msg: String): Unit = provider.stateAfterExecution.logger.warn(msg)
def error(msg: String): Unit = provider.stateAfterExecution.logger.error(msg)

/* This implementation of starting a server relies on two observables:
Expand Down Expand Up @@ -129,7 +130,7 @@ object BspServer {
}

try {
if (cancelled) error(s"BSP server cancelled, closing socket...")
if (cancelled) warn(s"BSP server cancelled, closing socket...")
else result.foreach(t => error(s"BSP server stopped by ${t.getMessage}"))
cancelable.cancel()
server.cancelAllRequests()
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/test/scala/bloop/DeduplicationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,11 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
}

test("deduplication doesn't work if project definition changes") {
TestUtil.retry() {
deduplicationIfProjectDefinitionChangesTest()
}
}
def deduplicationIfProjectDefinitionChangesTest(): Unit = {
val logger = new RecordingLogger(ansiCodesSupported = false)
BuildUtil.testSlowBuild(logger) { build =>
val state = new TestState(build.state)
Expand Down