Clean up

Author: AndreasArvidsson

packages/common/src/types/ScopeProvider.ts

@@ -218,6 +218,5 @@ export interface IterationScopeRanges {
 export enum ScopeSupport {
   supportedAndPresentInEditor,
   supportedButNotPresentInEditor,
-  supportedLegacy,
   unsupported,
 }

packages/cursorless-org-docs/src/docs/user/languages/components/ScopeSupport.tsx

@@ -17,9 +17,6 @@ export function ScopeSupport({ languageId }: Props): JSX.Element {
   const supportedScopes = scopesSorted.filter(
     (facet) => scopeSupport[facet] === ScopeSupportFacetLevel.supported,
   );
-  const supportedLegacyScopes = scopesSorted.filter(
-    (facet) => scopeSupport[facet] === ScopeSupportFacetLevel.supportedLegacy,
-  );
   const unsupportedScopes = scopesSorted.filter(
     (facet) => scopeSupport[facet] === ScopeSupportFacetLevel.unsupported,
   );
@@ -38,12 +35,6 @@ export function ScopeSupport({ languageId }: Props): JSX.Element {
         open
       />
 
-      <ScopeSupportForLevel
-        facets={supportedLegacyScopes}
-        title="Supported Legacy facets"
-        subtitle="These facets are supported with the legacy implementation and should be migrated to the new implementation"
-      />
-
       <ScopeSupportForLevel
         facets={unsupportedScopes}
         title="Unsupported facets"

packages/cursorless-vscode/src/ScopeTreeProvider.ts

@@ -112,7 +112,7 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
   getChildren(element?: MyTreeItem): MyTreeItem[] {
     if (element == null) {
       void this.possiblyShowUpdateTalonMessage();
-      return getSupportCategories(this.hasLegacyScopes());
+      return getSupportCategories();
     }
 
     if (element instanceof SupportCategoryTreeItem) {
@@ -156,12 +156,6 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
     }
   }
 
-  private hasLegacyScopes(): boolean {
-    return this.supportLevels.some(
-      (supportLevel) => supportLevel.support === ScopeSupport.supportedLegacy,
-    );
-  }
-
   private getScopeTypesWithSupport(
     scopeSupport: ScopeSupport,
   ): ScopeSupportTreeItem[] {
@@ -210,15 +204,10 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
   }
 }
 
-function getSupportCategories(
-  includeLegacy: boolean,
-): SupportCategoryTreeItem[] {
+function getSupportCategories(): SupportCategoryTreeItem[] {
   return [
     new SupportCategoryTreeItem(ScopeSupport.supportedAndPresentInEditor),
     new SupportCategoryTreeItem(ScopeSupport.supportedButNotPresentInEditor),
-    ...(includeLegacy
-      ? [new SupportCategoryTreeItem(ScopeSupport.supportedLegacy)]
-      : []),
     new SupportCategoryTreeItem(ScopeSupport.unsupported),
   ];
 }
@@ -314,11 +303,6 @@ class SupportCategoryTreeItem extends TreeItem {
         description = "but not present in active editor";
         collapsibleState = TreeItemCollapsibleState.Expanded;
         break;
-      case ScopeSupport.supportedLegacy:
-        label = "Legacy";
-        description = "may or may not be present in active editor";
-        collapsibleState = TreeItemCollapsibleState.Expanded;
-        break;
       case ScopeSupport.unsupported:
         label = "Unsupported";
         description = "unsupported in language of active editor";

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeScopeVisualizer.ts

@@ -63,7 +63,6 @@ export abstract class VscodeScopeVisualizer {
       case ScopeSupport.supportedAndPresentInEditor:
       case ScopeSupport.supportedButNotPresentInEditor:
         return;
-      case ScopeSupport.supportedLegacy:
       case ScopeSupport.unsupported:
         void showError(
           this.ide.messages,