Skip to content

Hide legacy category from scope visualizer in fully migrated languages #2727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Hide legacy category from scope visualizer in fully migrated languages #2727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d96f64
Hide legacy scope from scope visualizer in fully migrated languages
AndreasArvidsson Jan 14, 2025
79cb9f1
clean up
AndreasArvidsson Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions packages/cursorless-vscode/src/ScopeTreeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
getChildren(element?: MyTreeItem): MyTreeItem[] {
if (element == null) {
void this.possiblyShowUpdateTalonMessage();
return getSupportCategories();
return getSupportCategories(this.hasLegacyScopes());
}

if (element instanceof SupportCategoryTreeItem) {
Expand Down Expand Up @@ -156,7 +156,15 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
}
}

getScopeTypesWithSupport(scopeSupport: ScopeSupport): ScopeSupportTreeItem[] {
private hasLegacyScopes(): boolean {
return this.supportLevels.some(
(supportLevel) => supportLevel.support === ScopeSupport.supportedLegacy,
);
}

private getScopeTypesWithSupport(
scopeSupport: ScopeSupport,
): ScopeSupportTreeItem[] {
return this.supportLevels
.filter(
(supportLevel) =>
Expand Down Expand Up @@ -202,11 +210,15 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
}
}

function getSupportCategories(): SupportCategoryTreeItem[] {
function getSupportCategories(
includeLegacy: boolean,
): SupportCategoryTreeItem[] {
return [
new SupportCategoryTreeItem(ScopeSupport.supportedAndPresentInEditor),
new SupportCategoryTreeItem(ScopeSupport.supportedButNotPresentInEditor),
new SupportCategoryTreeItem(ScopeSupport.supportedLegacy),
...(includeLegacy
? [new SupportCategoryTreeItem(ScopeSupport.supportedLegacy)]
: []),
new SupportCategoryTreeItem(ScopeSupport.unsupported),
];
}
Expand Down
Loading