Skip to content

Commit 23f1845

Browse files
authored
Merge pull request #5456 from dotty-staging/fix/discard-message-request
Fix crash when `showMessageRequest` is discarded
2 parents 0a1aed2 + 6226700 commit 23f1845

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,11 @@ class DottyLanguageServer extends LanguageServer
594594
request.setMessage(message)
595595
request.setType(tpe)
596596

597-
client.showMessageRequest(request).thenApply { (answer: MessageActionItem) =>
598-
choices.find(_._1 == answer.getTitle).map {
599-
case (_, action) => action()
600-
}
597+
client.showMessageRequest(request).thenApply { (message: MessageActionItem) =>
598+
for {
599+
answer <- Option(message)
600+
(_, action) <- choices.find(_._1 == answer.getTitle)
601+
} yield action()
601602
}
602603
}
603604
}

0 commit comments

Comments
 (0)