SLI-1816 Interrupting the branch matching computation should not cause an error #1292
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nquinquenel
requested changes
Jan 29, 2025
eray-felek-sonarsource
force-pushed
the
feature/ef/SLI-1816-dont-throw-noisy-error
branch
2 times, most recently
from
ea3f744 to
63ff89d
Compare
eray-felek-sonarsource
force-pushed
the
feature/ef/SLI-1816-dont-throw-noisy-error
branch
from
63ff89d to
5c8b7e6
Compare
eray-felek-sonarsource
force-pushed
the
feature/ef/SLI-1816-dont-throw-noisy-error
branch
from
5c8b7e6 to
ae7b7ce
Compare
nquinquenel
reviewed
Jan 29, 2025
| } | ||
| }) | ||
| return computeOnPooledThread(project, "Waiting for branch matching result") { resultFuture.get() } | ||
| return computeOnPooledThread(project, "Waiting for branch matching result") { | ||
| try { |
There was a problem hiding this comment.
I don't think you need this try/catch here?
| @@ -644,11 +649,27 @@ object SonarLintIntelliJClient : SonarLintRpcClientDelegate { | |||
| PerformInBackgroundOption.ALWAYS_BACKGROUND | |||
| ) { | |||
| override fun run(indicator: ProgressIndicator) { | |||
| val result = repo.electBestMatchingServerBranchForCurrentHead(mainBranchName, allBranchesNames) ?: mainBranchName | |||
| resultFuture.complete(result) | |||
| try { | |||
There was a problem hiding this comment.
I think you can reuse FutureUtils.waitForTask, it seems very similar
|
eray-felek-sonarsource
deleted the
feature/ef/SLI-1816-dont-throw-noisy-error
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SLI-1816