Merge with main

Author: AndreasArvidsson

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

@@ -1,11 +1,11 @@
 import {
   ScopeSupportFacetLevel,
   languageScopeSupport,
+  plaintextScopeSupportFacetInfos,
   scopeSupportFacetInfos,
   scopeSupportFacets,
-  textualScopeSupportFacetInfos,
+  type PlaintextScopeSupportFacet,
   type ScopeSupportFacet,
-  type TextualScopeSupportFacet,
 } from "@cursorless/common";
 import * as React from "react";
 import {
@@ -19,14 +19,14 @@ interface Props {
 
 function getSupport(languageId: string): FacetWrapper[] {
   if (languageId === "plaintext") {
-    return Object.keys(textualScopeSupportFacetInfos)
+    return Object.keys(plaintextScopeSupportFacetInfos)
       .sort()
       .map((f) => {
-        const facet = f as TextualScopeSupportFacet;
+        const facet = f as PlaintextScopeSupportFacet;
         return {
           facet,
           supportLevel: ScopeSupportFacetLevel.supported,
-          info: textualScopeSupportFacetInfos[facet],
+          info: plaintextScopeSupportFacetInfos[facet],
         };
       });
   }

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

@@ -1,16 +1,16 @@
 import {
   groupBy,
   serializeScopeType,
+  type PlaintextScopeSupportFacet,
   type ScopeSupportFacet,
   type ScopeSupportFacetInfo,
   type ScopeSupportFacetLevel,
-  type TextualScopeSupportFacet,
 } from "@cursorless/common";
 import React, { useState, type JSX } from "react";
 import { prettifyFacet, prettifyScopeType } from "./util";
 
 export interface FacetWrapper {
-  facet: ScopeSupportFacet | TextualScopeSupportFacet;
+  facet: ScopeSupportFacet | PlaintextScopeSupportFacet;
   supportLevel: ScopeSupportFacetLevel | undefined;
   info: ScopeSupportFacetInfo;
 }

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

@@ -1,9 +1,9 @@
 import {
   Range,
   serializeScopeType,
+  type PlaintextScopeSupportFacet,
   type ScopeSupportFacet,
   type ScopeSupportFacetInfo,
-  type TextualScopeSupportFacet,
 } from "@cursorless/common";
 import React, { useState } from "react";
 import scopeTestsJson from "../../../../../static/scopeTests.json";
@@ -22,7 +22,7 @@ interface Scope {
 }
 
 interface Facet {
-  facet: ScopeSupportFacet | TextualScopeSupportFacet;
+  facet: ScopeSupportFacet | PlaintextScopeSupportFacet;
   name: string;
   info: ScopeSupportFacetInfo;
   fixtures: Fixture[];
@@ -199,9 +199,6 @@ function getOverlap(a: Range, b: Range): Range | null {
 }
 
 function getScopeFixtures(languageId: string): Scope[] {
-  if (languageId === "plaintext") {
-    languageId = "textual";
-  }
   const languageIds = new Set<string>(
     scopeTests.imports[languageId] ?? [languageId],
   );

packages/cursorless-org-docs/src/docs/user/languages/components/types.ts

@@ -1,6 +1,6 @@
 import type {
   ScopeSupportFacet,
-  TextualScopeSupportFacet,
+  PlaintextScopeSupportFacet,
 } from "@cursorless/common";
 
 export interface ScopeTestsJson {
@@ -10,7 +10,7 @@ export interface ScopeTestsJson {
 
 export interface Fixture {
   name: string;
-  facet: ScopeSupportFacet | TextualScopeSupportFacet;
+  facet: ScopeSupportFacet | PlaintextScopeSupportFacet;
   languageId: string;
   code: string;
   scopes: Scope[];

packages/cursorless-org-docs/src/docs/user/languages/components/util.ts

@@ -2,14 +2,14 @@ import {
   camelCaseToAllDown,
   capitalize,
   scopeSupportFacetInfos,
-  textualScopeSupportFacetInfos,
+  plaintextScopeSupportFacetInfos,
   type ScopeSupportFacet,
   type ScopeSupportFacetInfo,
-  type TextualScopeSupportFacet,
+  type PlaintextScopeSupportFacet,
 } from "@cursorless/common";
 
 export function prettifyFacet(
-  facet: ScopeSupportFacet | TextualScopeSupportFacet,
+  facet: ScopeSupportFacet | PlaintextScopeSupportFacet,
   keepScopeType: boolean,
 ): string {
   let parts = facet.split(".").map(camelCaseToAllDown);
@@ -40,11 +40,11 @@ export function prettifyScopeType(scopeType: string): string {
 
 export function getFacetInfo(
   languageId: string,
-  facetId: ScopeSupportFacet | TextualScopeSupportFacet,
+  facetId: ScopeSupportFacet | PlaintextScopeSupportFacet,
 ): ScopeSupportFacetInfo {
   const facetInfo =
-    languageId === "textual"
-      ? textualScopeSupportFacetInfos[facetId as TextualScopeSupportFacet]
+    languageId === "plaintext"
+      ? plaintextScopeSupportFacetInfos[facetId as PlaintextScopeSupportFacet]
       : scopeSupportFacetInfos[facetId as ScopeSupportFacet];
 
   if (facetInfo == null) {