improved handling of lsp failure state #309
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.eclipse.amazonq.lsp.manager; | ||
|
|
||
| public enum LspState { | ||
| ACTIVE, | ||
| FAILED, | ||
| PENDING | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.eclipse.amazonq.lsp.manager; | ||
|
|
||
| import software.aws.toolkits.eclipse.amazonq.plugin.Activator; | ||
| import software.aws.toolkits.eclipse.amazonq.views.ViewVisibilityManager; | ||
|
|
||
| public final class LspStatusManager { | ||
|
There was a problem hiding this comment. I think we can avoid having the LspStatusManager. The EventBroker keeps track of the latest state, so if we emit to the event bus, then every subscriber will get the latest LSP state when the subscribe. |
||
|
|
||
| private static final LspStatusManager INSTANCE; | ||
| private LspState lspState; | ||
|
|
||
| static { | ||
| INSTANCE = new LspStatusManager(); | ||
| } | ||
|
|
||
| private LspStatusManager() { | ||
| lspState = LspState.PENDING; | ||
| Activator.getEventBroker().post(lspState); | ||
| } | ||
|
|
||
| public static LspStatusManager getInstance() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
|
|
||
| public boolean lspFailed() { | ||
| return (lspState == LspState.FAILED); | ||
| } | ||
|
|
||
| public void setToActive() { | ||
| lspState = LspState.ACTIVE; | ||
| Activator.getEventBroker().post(lspState); | ||
| ViewVisibilityManager.showDefaultView("restart"); | ||
|
There was a problem hiding this comment. what does the string value represent? It is unclear what it does to me. If its somehow related to metrics it should be indicated so with a enum class that holds these string eg. if this represents a click event then Source.Restart and similar There was a problem hiding this comment. The string value is indeed metric related, and you're right that it should be an enum. I'll start work to refactor all these instances. These metric strings are widely used and I don't want to dilute this PR with the changes, thus I'll open a separate PR with the edits. |
||
| } | ||
|
|
||
| public void setToFailed() { | ||
| if (lspState != LspState.FAILED) { | ||
| ViewVisibilityManager.showLspStartUpFailedView("update"); | ||
| lspState = LspState.FAILED; | ||
| Activator.getEventBroker().post(lspState); | ||
| } | ||
| } | ||
|
|
||
| public LspState getLspState() { | ||
| return lspState; | ||
| } | ||
| } | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.eclipse.amazonq.views; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| import software.aws.toolkits.eclipse.amazonq.lsp.manager.LspStatusManager; | ||
|
|
||
| public final class LspStartUpFailedView extends BaseView { | ||
| public static final String ID = "software.aws.toolkits.eclipse.amazonq.views.LspStartUpFailedView"; | ||
|
|
||
| private static final String ICON_PATH = "icons/AmazonQ64.png"; | ||
| private static final String HEADER_LABEL = "Language Server failed to start."; | ||
| private static final String DETAIL_MESSAGE = "Restart Eclipse or review error logs for troubleshooting"; | ||
|
|
||
| /* TODO: After refactor of LSP error handling is completed, | ||
| * add logic to base detail_message on error code returned from exception | ||
| * */ | ||
| @Override | ||
| protected String getIconPath() { | ||
| return ICON_PATH; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getHeaderLabel() { | ||
| return HEADER_LABEL; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getDetailMessage() { | ||
| return DETAIL_MESSAGE; | ||
| } | ||
|
|
||
| @Override | ||
| protected void showAlternateView() { | ||
| ViewVisibilityManager.showDefaultView("restart"); | ||
| } | ||
|
|
||
| @Override | ||
| protected CompletableFuture<Boolean> isViewDisplayable() { | ||
| return CompletableFuture.completedFuture(LspStatusManager.getInstance().lspFailed()); | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this caught by startProcess on L70?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, both these exceptions are caught at separate changes so no overlap. The exception on L47 is caught by eclipse during instantiation of the class, and the exception on L70 is caught once eclipse begins the LSP init process in the earlyStartup process.