Merge branch 'main' into selectedScopeVisualizer

Author: AndreasArvidsson

data/fixtures/recorded/actions/bringName.yml

@@ -0,0 +1,86 @@
+languageId: typescript
+command:
+  version: 7
+  spokenForm: bring name
+  action:
+    name: replaceWithTarget
+    source:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+    destination: {type: implicit}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    function aaa() {
+      ;
+      ;
+    }
+
+    function bbb() {
+      ;
+    }
+  selections:
+    - anchor: {line: 1, character: 2}
+      active: {line: 1, character: 2}
+    - anchor: {line: 2, character: 2}
+      active: {line: 2, character: 2}
+    - anchor: {line: 6, character: 2}
+      active: {line: 6, character: 2}
+  marks: {}
+finalState:
+  documentContents: |-
+    function aaa() {
+      aaa;
+      aaa;
+    }
+
+    function bbb() {
+      bbb;
+    }
+  selections:
+    - anchor: {line: 1, character: 5}
+      active: {line: 1, character: 5}
+    - anchor: {line: 2, character: 5}
+      active: {line: 2, character: 5}
+    - anchor: {line: 6, character: 5}
+      active: {line: 6, character: 5}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 1, character: 2}
+        end: {line: 1, character: 5}
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 2, character: 2}
+        end: {line: 2, character: 5}
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 6, character: 2}
+        end: {line: 6, character: 5}
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 9}
+        end: {line: 0, character: 12}
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 9}
+        end: {line: 0, character: 12}
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 5, character: 9}
+        end: {line: 5, character: 12}
+      isReversed: false
+      hasExplicitRange: true

data/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml

@@ -56,4 +56,4 @@ finalState:
       end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
+      end: {line: 0, character: 18}

data/scopeSupportFacetInfos.md

@@ -119,7 +119,7 @@
 
 ### disqualifyDelimiter
 
-- `disqualifyDelimiter` Used to disqualify a token from being treated as a surrounding pair delimiter. This will usually be operators containing `>` or `<`, eg `<`, `<=`, `->`, etc
+- `disqualifyDelimiter` Internally used to disqualify a token from being treated as a surrounding pair delimiter. This will usually be operators containing `>` or `<`, eg `<`, `<=`, `->`, etc.
 
 ### document
 
@@ -259,7 +259,7 @@
 
 ### pairDelimiter
 
-- `pairDelimiter` A pair delimiter, eg parentheses, brackets, braces, quotes, etc
+- `pairDelimiter` Internally used to add additional language specific surrounding pair delimiters in addition to the text based definitions. eg `r"`.
 
 ### paragraph
 
@@ -336,11 +336,11 @@
 
 ### textFragment
 
-- `textFragment.comment.block` Text fragment consisting of a block comment
-- `textFragment.comment.line` Text fragment consisting of a line comment
-- `textFragment.element` Text fragment consisting of a xml element interior
-- `textFragment.string.multiLine` Text fragment consisting of a multi-line string
-- `textFragment.string.singleLine` Text fragment consisting of a single-line string
+- `textFragment.comment.block` Internally used text fragment consisting of a block comment
+- `textFragment.comment.line` Internally used text fragment consisting of a line comment
+- `textFragment.element` Internally used text fragment consisting of a xml element interior
+- `textFragment.string.multiLine` Internally used text fragment consisting of a multi-line string
+- `textFragment.string.singleLine` Internally used text fragment consisting of a single-line string
 
 ### token
 

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -474,38 +474,6 @@ export const scopeSupportFacetInfos: Record<
     scopeType: "string",
   },
 
-  "textFragment.comment.line": {
-    description: "Text fragment consisting of a line comment",
-    scopeType: "textFragment",
-  },
-  "textFragment.comment.block": {
-    description: "Text fragment consisting of a block comment",
-    scopeType: "textFragment",
-  },
-  "textFragment.string.singleLine": {
-    description: "Text fragment consisting of a single-line string",
-    scopeType: "textFragment",
-  },
-  "textFragment.string.multiLine": {
-    description: "Text fragment consisting of a multi-line string",
-    scopeType: "textFragment",
-  },
-  "textFragment.element": {
-    description: "Text fragment consisting of a xml element interior",
-    scopeType: "textFragment",
-  },
-
-  disqualifyDelimiter: {
-    description:
-      "Used to disqualify a token from being treated as a surrounding pair delimiter. This will usually be operators containing `>` or `<`, eg `<`, `<=`, `->`, etc",
-    scopeType: "disqualifyDelimiter",
-  },
-  pairDelimiter: {
-    description:
-      "A pair delimiter, eg parentheses, brackets, braces, quotes, etc",
-    scopeType: "pairDelimiter",
-  },
-
   "branch.if": {
     description: "An if branch",
     scopeType: "branch",
@@ -1044,6 +1012,43 @@ export const scopeSupportFacetInfos: Record<
     description: "A unit in a css rule set",
     scopeType: "unit",
   },
+
+  // Internal scope facets
+
+  "textFragment.comment.line": {
+    description: "Internally used text fragment consisting of a line comment",
+    scopeType: "textFragment",
+  },
+  "textFragment.comment.block": {
+    description: "Internally used text fragment consisting of a block comment",
+    scopeType: "textFragment",
+  },
+  "textFragment.string.singleLine": {
+    description:
+      "Internally used text fragment consisting of a single-line string",
+    scopeType: "textFragment",
+  },
+  "textFragment.string.multiLine": {
+    description:
+      "Internally used text fragment consisting of a multi-line string",
+    scopeType: "textFragment",
+  },
+  "textFragment.element": {
+    description:
+      "Internally used text fragment consisting of a xml element interior",
+    scopeType: "textFragment",
+  },
+
+  disqualifyDelimiter: {
+    description:
+      "Internally used to disqualify a token from being treated as a surrounding pair delimiter. This will usually be operators containing `>` or `<`, eg `<`, `<=`, `->`, etc.",
+    scopeType: "disqualifyDelimiter",
+  },
+  pairDelimiter: {
+    description:
+      'Internally used to add additional language specific surrounding pair delimiters in addition to the text based definitions. eg `r"`.',
+    scopeType: "pairDelimiter",
+  },
 };
 
 function documentIter(

packages/cursorless-engine/src/core/commandRunner/CommandRunnerImpl.ts

@@ -27,6 +27,7 @@ export class CommandRunnerImpl implements CommandRunner {
   private inferenceContext: InferenceContext;
   private finalStages: ModifierStage[] = [];
   private noAutomaticTokenExpansion: boolean | undefined;
+  private allowDuplicateTargets: boolean | undefined;
 
   constructor(
     private commandServerApi: CommandServerApi,
@@ -103,6 +104,7 @@ export class CommandRunnerImpl implements CommandRunner {
 
     switch (actionDescriptor.name) {
       case "replaceWithTarget":
+        this.allowDuplicateTargets = true;
         return this.actions.replaceWithTarget.run(
           this.getTargets(actionDescriptor.source),
           this.getDestinations(actionDescriptor.destination),
@@ -239,6 +241,7 @@ export class CommandRunnerImpl implements CommandRunner {
     return this.pipelineRunner.run(targetDescriptor, {
       actionFinalStages: this.finalStages,
       noAutomaticTokenExpansion: this.noAutomaticTokenExpansion,
+      allowDuplicateTargets: this.allowDuplicateTargets,
     });
   }
 

packages/cursorless-engine/src/processTargets/TargetPipelineRunner.ts

@@ -27,6 +27,7 @@ import { PlainTarget } from "./targets";
 interface TargetPipelineRunnerOpts {
   actionFinalStages?: ModifierStage[];
   noAutomaticTokenExpansion?: boolean;
+  allowDuplicateTargets?: boolean;
 }
 
 export class TargetPipelineRunner {
@@ -53,13 +54,14 @@ export class TargetPipelineRunner {
     {
       actionFinalStages = [],
       noAutomaticTokenExpansion = false,
+      allowDuplicateTargets = false,
     }: TargetPipelineRunnerOpts = {},
   ): Target[] {
     return new TargetPipeline(
       this.modifierStageFactory,
       this.markStageFactory,
       target,
-      { actionFinalStages, noAutomaticTokenExpansion },
+      { actionFinalStages, noAutomaticTokenExpansion, allowDuplicateTargets },
     ).run();
   }
 }
@@ -87,7 +89,8 @@ class TargetPipeline {
    * the target
    */
   run(): Target[] {
-    return uniqTargets(this.processTarget(this.target));
+    const targets = this.processTarget(this.target);
+    return this.opts.allowDuplicateTargets ? targets : uniqTargets(targets);
   }
 
   processTarget(target: TargetDescriptor): Target[] {

packages/cursorless-org-docs/src/docs/components/Header.css

@@ -0,0 +1,3 @@
+.anchor-with-sticky-navbar {
+  scroll-margin-top: calc(var(--ifm-navbar-height) + 0.5rem);
+}

packages/cursorless-org-docs/src/docs/components/Header.tsx

@@ -1,5 +1,6 @@
 import { uriEncodeHashId } from "@cursorless/common";
 import React from "react";
+import "./Header.css";
 
 interface Props {
   className?: string;
@@ -35,8 +36,7 @@ function renderHeader(
       id={encodedId}
       title={title}
       className={
-        "scope-header anchorWithStickyNavbar_IncK" +
-        (className ? " " + className : "")
+        "anchor-with-sticky-navbar" + (className ? " " + className : "")
       }
     >
       {children}