Guard active widget tracking for undefined value #75
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
tortmayr
reviewed
May 19, 2021
| @@ -151,7 +151,7 @@ export class GLSPDiagramWidget extends DiagramWidget implements SaveableSource { | |||
| listenToFocusState(shell: ApplicationShell): void { | |||
| this.toDispose.push(shell.onDidChangeActiveWidget(event => { | |||
| const focusedWidget = event.newValue; | |||
| if (this.hasFocus && !this.isThisWidget(focusedWidget)) { | |||
| if (this.hasFocus && focusedWidget && !this.isThisWidget(focusedWidget)) { | |||
There was a problem hiding this comment.
Maybe its better to directly include the undefined check into the isThisWidget() guard function? e.g:
protected isThisWidget(widget?: Widget | null): boolean {
// eslint-disable-next-line no-null/no-null
if (!widget || widget === null) {
return false;
}
const diagramWidget = getDiagramWidget(widget);
return diagramWidget !== undefined && diagramWidget.id === this.id;
}There was a problem hiding this comment.
Yeah, but that is not the same behavior, is it?
We want to omit checking whether it is this.isthisWidget() altogether if it is null. In your version, if focusedWidget is null, we'd return false and send out the FocusStateChangedAction even though the focusedWidget was null and no other widget.
There was a problem hiding this comment.
Ah I see. i overlooked the ! operator in front of this.isThisWidget 😄.
In that case, ignore my comment and lets merge this 😉
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.
Fixes eclipse-glsp/glsp#243