Scope tests

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
         # tests use strings with trailing white space to represent the final
         # document contents. For example
         # packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
-        exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$|/generated/|^patches/
+        exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$|scope$|/generated/|^patches/
   - repo: local
     hooks:
       - id: eslint

packages/common/src/index.ts

@@ -94,3 +94,8 @@ export * from "./types/TestCaseFixture";
 export * from "./util/getEnvironmentVariableStrict";
 export * from "./util/CompositeKeyDefaultMap";
 export * from "./util/toPlainObject";
+export * from "./scopeSupportFacets/scopeSupportFacets.types";
+export * from "./scopeSupportFacets/scopeSupportFacetInfos";
+export * from "./scopeSupportFacets/textualScopeSupportFacetInfos";
+export * from "./scopeSupportFacets/getLanguageScopeSupport";
+export * from "./scopeSupportFacets/textual";

packages/common/src/scopeSupportFacets/getLanguageScopeSupport.ts

@@ -0,0 +1,15 @@
+import { htmlScopeSupport } from "./html";
+import { javascriptScopeSupport } from "./javascript";
+import { LanguageScopeSupportFacetMap } from "./scopeSupportFacets.types";
+
+export function getLanguageScopeSupport(
+  languageId: string,
+): LanguageScopeSupportFacetMap {
+  switch (languageId) {
+    case "javascript":
+      return javascriptScopeSupport;
+    case "html":
+      return htmlScopeSupport;
+  }
+  throw Error(`Unsupported language: '${languageId}'`);
+}

packages/common/src/scopeSupportFacets/html.ts

@@ -0,0 +1,19 @@
+import {
+  LanguageScopeSupportFacetMap,
+  ScopeSupportFacetLevel,
+} from "./scopeSupportFacets.types";
+
+const { supported, notApplicable } = ScopeSupportFacetLevel;
+
+export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
+  ["key.attribute"]: supported,
+  ["tags"]: supported,
+
+  namedFunction: notApplicable,
+  ["name.assignment"]: notApplicable,
+  ["key.mapPair"]: notApplicable,
+  ["key.mapPair.iteration"]: notApplicable,
+  ["value.mapPair"]: notApplicable,
+  ["value.mapPair.iteration"]: notApplicable,
+  ["value.assignment"]: notApplicable,
+};

packages/common/src/scopeSupportFacets/javascript.ts

@@ -0,0 +1,19 @@
+import {
+  LanguageScopeSupportFacetMap,
+  ScopeSupportFacetLevel,
+} from "./scopeSupportFacets.types";
+
+const { supported, notApplicable } = ScopeSupportFacetLevel;
+
+export const javascriptScopeSupport: LanguageScopeSupportFacetMap = {
+  namedFunction: supported,
+  ["name.assignment"]: supported,
+  ["key.mapPair"]: supported,
+  ["key.mapPair.iteration"]: supported,
+  ["value.mapPair"]: supported,
+  ["value.mapPair.iteration"]: supported,
+  ["value.assignment"]: supported,
+
+  ["key.attribute"]: notApplicable,
+  ["tags"]: notApplicable,
+};

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -0,0 +1,66 @@
+import {
+  ScopeSupportFacet,
+  ScopeSupportFacetInfo,
+} from "./scopeSupportFacets.types";
+
+export const scopeSupportFacetInfos: Record<
+  ScopeSupportFacet,
+  ScopeSupportFacetInfo
+> = {
+  namedFunction: {
+    label: "Named function",
+    description: "A named function",
+    scopeType: "namedFunction",
+    examples: ["function foo() {}", "const foo = () => {}"],
+  },
+  ["name.assignment"]: {
+    label: "Assignment name",
+    description: "Name(LHS) of an assignment",
+    scopeType: "name",
+    examples: ["const foo = 1"],
+  },
+  ["key.attribute"]: {
+    label: "Attributes key",
+    description: "Key(LHS) of an attribute",
+    scopeType: "collectionKey",
+    examples: ['id="root"'],
+  },
+  ["key.mapPair"]: {
+    label: "Map key",
+    description: "Key(LHS) of a map pair",
+    scopeType: "collectionKey",
+    examples: ["value: 0"],
+  },
+  ["key.mapPair.iteration"]: {
+    label: "Map pair key iteration",
+    description: "Iteration of map pair keys",
+    scopeType: "collectionKey",
+    isIteration: true,
+    examples: ["{ value: 0 }"],
+  },
+  ["value.assignment"]: {
+    label: "Assignment value",
+    description: "Value(RHS) of an assignment",
+    scopeType: "value",
+    examples: ["const foo = 1"],
+  },
+  ["value.mapPair"]: {
+    label: "Map pair value",
+    description: "Key(RHS) of a map pair",
+    scopeType: "value",
+    examples: ["value: 0"],
+  },
+  ["value.mapPair.iteration"]: {
+    label: "Map pair value iteration",
+    description: "Iteration of map pair values",
+    scopeType: "value",
+    isIteration: true,
+    examples: ["{ value: 0 }"],
+  },
+  ["tags"]: {
+    label: "Tags",
+    description: "Both tags in an xml element",
+    scopeType: "xmlBothTags",
+    examples: ["<div></div>"],
+  },
+};

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -0,0 +1,87 @@
+import { SimpleScopeTypeType } from "../types/command/PartialTargetDescriptor.types";
+
+const scopeSupportFacets = [
+  //   "list",
+  //   "list.interior",
+  //   "map",
+  //   "map.interior",
+  //   "collectionKey",
+  "namedFunction",
+  //   "namedFunction.interior",
+  //   "functionName",
+  //   "anonymousFunction",
+  //   "anonymousFunction.interior",
+  "name.assignment",
+  "key.attribute",
+  "key.mapPair",
+  "key.mapPair.iteration",
+  "value.assignment",
+  "value.mapPair",
+  "value.mapPair.iteration",
+  //   "value.assignment.removal",
+  //   "value.return",
+  //   "value.return.removal",
+  //   "value.collectionItem",
+  //   "value.collectionItem.removal",
+  //   "statement",
+  //   "ifStatement",
+  //   "condition.if",
+  //   "condition.while",
+  //   "condition.doWhile",
+  //   "condition.for",
+  //   "condition.ternary",
+  //   "branch",
+  //   "comment.line",
+  //   "comment.block",
+  //   "string.singleLine",
+  //   "string.multiLine",
+  //   "textFragment",
+  //   "functionCall",
+  //   "functionCallee",
+  //   "argumentOrParameter.argument",
+  //   "argumentOrParameter.argument.removal",
+  //   "argumentOrParameter.parameter",
+  //   "argumentOrParameter.parameter.removal",
+  //   "class",
+  //   "class.interior",
+  //   "className",
+  //   "type",
+  "tags",
+] as const;
+
+const textualScopeSupportFacets = [
+  "character",
+  "word",
+  "token",
+  "line",
+  "paragraph",
+  "document",
+] as const;
+
+export interface ScopeSupportFacetInfo {
+  readonly label: string;
+  readonly description: string;
+  readonly scopeType: SimpleScopeTypeType;
+  readonly isIteration?: boolean;
+  readonly examples: readonly string[];
+}
+
+export enum ScopeSupportFacetLevel {
+  supported,
+  unsupported,
+  notApplicable,
+}
+
+export type ScopeSupportFacet = (typeof scopeSupportFacets)[number];
+
+export type TextualScopeSupportFacet =
+  (typeof textualScopeSupportFacets)[number];
+
+export type LanguageScopeSupportFacetMap = Partial<
+  Record<ScopeSupportFacet, ScopeSupportFacetLevel>
+>;
+
+export type TextualLanguageScopeSupportFacetMap = Record<
+  TextualScopeSupportFacet,
+  ScopeSupportFacetLevel
+>;

packages/common/src/scopeSupportFacets/textual.ts

@@ -0,0 +1,15 @@
+import {
+  ScopeSupportFacetLevel,
+  TextualLanguageScopeSupportFacetMap,
+} from "./scopeSupportFacets.types";
+
+const { supported } = ScopeSupportFacetLevel;
+
+export const textualScopeSupport: TextualLanguageScopeSupportFacetMap = {
+  character: supported,
+  word: supported,
+  token: supported,
+  line: supported,
+  paragraph: supported,
+  document: supported,
+};

packages/common/src/scopeSupportFacets/textualScopeSupportFacetInfos.ts

@@ -0,0 +1,47 @@
+import {
+  ScopeSupportFacetInfo,
+  TextualScopeSupportFacet,
+} from "./scopeSupportFacets.types";
+
+export const textualScopeSupportFacetInfos: Record<
+  TextualScopeSupportFacet,
+  ScopeSupportFacetInfo
+> = {
+  character: {
+    label: "Character",
+    description: "A single character in the document",
+    scopeType: "character",
+    examples: ["a", "."],
+  },
+  word: {
+    label: "Word",
+    description: "A single word in a token",
+    scopeType: "word",
+    examples: ["foo_bar", "fooBar"],
+  },
+  token: {
+    label: "Token",
+    description: "A single token in the document",
+    scopeType: "token",
+    examples: ["foo", "("],
+  },
+  line: {
+    label: "Line",
+    description: "A single line in the document",
+    scopeType: "line",
+    examples: ["foo"],
+  },
+  paragraph: {
+    label: "Paragraph",
+    description:
+      "A single paragraph(contiguous block of lines) in the document",
+    scopeType: "paragraph",
+    examples: ["foo\nbar"],
+  },
+  document: {
+    label: "Documents",
+    description: "The entire document",
+    scopeType: "document",
+    examples: ["foo\n\nbar"],
+  },
+};

packages/common/src/testUtil/getFixturePaths.ts

@@ -21,6 +21,10 @@ export function getRecordedTestsDirPath() {
   return path.join(getFixturesPath(), "recorded");
 }
 
+export function getScopeTestsDirPath() {
+  return path.join(getFixturesPath(), "scopes");
+}
+
 export function getRecordedTestPaths() {
   const directory = getRecordedTestsDirPath();
   const relativeDir = path.dirname(directory);
@@ -34,3 +38,17 @@ export function getRecordedTestPaths() {
       path: p,
     }));
 }
+
+export function getScopeTestPaths() {
+  const directory = getScopeTestsDirPath();
+  const relativeDir = path.dirname(directory);
+
+  return walkFilesSync(directory)
+    .filter((p) => p.endsWith(".scope"))
+    .map((p) => ({
+      path: p,
+      name: path.relative(relativeDir, p.substring(0, p.lastIndexOf("."))),
+      languageId: path.dirname(path.relative(directory, p)).split(path.sep)[0],
+      facet: path.basename(p).match(/([a-zA-Z.]+)\d*\.scope/)![1],
+    }));
+}

packages/common/src/types/ScopeProvider.ts

@@ -178,7 +178,13 @@ export interface ScopeRanges {
  */
 export interface TargetRanges {
   contentRange: Range;
+  removalRange: Range;
   removalHighlightRange: GeneralizedRange;
+  leadingDelimiter: TargetRanges | undefined;
+  trailingDelimiter: TargetRanges | undefined;
+  interior: TargetRanges[] | undefined;
+  boundary: TargetRanges[] | undefined;
+  insertionDelimiter: string;
 }
 
 /**

packages/cursorless-engine/src/scopeProviders/getTargetRanges.ts

@@ -6,10 +6,36 @@ import {
 import { Target } from "../typings/target.types";
 
 export function getTargetRanges(target: Target): TargetRanges {
+  const interior = (() => {
+    try {
+      target.getInteriorStrict().map(getTargetRanges);
+    } catch (error) {
+      return undefined;
+    }
+  })();
+
+  const boundary = (() => {
+    try {
+      target.getBoundaryStrict().map(getTargetRanges);
+    } catch (error) {
+      return undefined;
+    }
+  })();
+
   return {
     contentRange: target.contentRange,
+    removalRange: target.getRemovalRange(),
     removalHighlightRange: target.isLine
       ? toLineRange(target.getRemovalHighlightRange())
       : toCharacterRange(target.getRemovalHighlightRange()),
+    leadingDelimiter: getOptionalTarget(target.getLeadingDelimiterTarget()),
+    trailingDelimiter: getOptionalTarget(target.getTrailingDelimiterTarget()),
+    interior,
+    boundary,
+    insertionDelimiter: target.insertionDelimiter,
   };
 }
+
+function getOptionalTarget(target: Target | undefined) {
+  return target != null ? getTargetRanges(target) : undefined;
+}

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute.scope

@@ -0,0 +1,20 @@
+<div id="root"></div>
+---
+
+[Content] = 0:5-0:7
+0| <div id="root"></div>
+       >--<
+
+[Removal] = 0:5-0:8
+0| <div id="root"></div>
+       >---<
+
+[Trailing delimiter] = 0:7-0:8
+0| <div id="root"></div>
+         >-<
+
+[Domain] = 0:5-0:14
+0| <div id="root"></div>
+       >---------<
+
+[Insertion delimiter] = " "