Remove unnecessary catch which caused confusing error when iteration scopes were missing#2740
Merged
Remove unnecessary catch which caused confusing error when iteration scopes were missing#2740
Conversation
phillco
reviewed
Jan 21, 2025
Comment on lines
+76
to
+82
| scopes = this.getDefaultIterationRange( | ||
| scopeHandler, | ||
| this.scopeHandlerFactory, | ||
| target, | ||
| ).flatMap((iterationRange) => | ||
| getScopesOverlappingRange(scopeHandler, editor, iterationRange), | ||
| ); |
Member
There was a problem hiding this comment.
This basically reverts the logic added in https://github.com/cursorless-dev/cursorless/pull/2081/files#diff-a47f14c27291690e54ca5b2e034c62193e9da0615bdb7b3be4153ede7668914f.
It was necessary when there was this fallback code after it:
if (scopes.length === 0) {
if (scopeType.type === "collectionItem") {
// For `collectionItem`, fall back to generic implementation
return this.modifierStageFactory
.getLegacyScopeStage(this.modifier)
.run(target);
}
throw new NoContainingScopeError(scopeType.type);
}
We have since removed the legacy code but didn't know that this code also needed to be removed
1 task
phillco
approved these changes
Jan 21, 2025
This file contains hidden or 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
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.
Today's implementation when you say something like
take every itemwill show an error messageCouldn't find containing collectionItem.even if it's the iteration scope that is missing.This change makes it so that we get the error message
Couldn't find containing iteration scope for collectionItem.instead. This greatly helps us with diagnosing what actually went wrong.For program languages were a scope is defined in Tree sitter the current error message makes little sense. You could use
take scopeand it works fine, but when you saytake every scopeyou get an error message that there is no scope. Much better to actually show that this language is missing an iteration scope.Checklist