Attempt to make new raw selections work

Author: pokey

.vscode/settings.json

@@ -12,9 +12,10 @@
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off",
     "cSpell.words": [
-        "subword",
+        "Autoformatting",
         "eqeqeq",
         "nonlocal",
-        "pojo"
+        "pojo",
+        "subword"
     ]
 }

src/actions/BringMoveSwap.ts

@@ -115,10 +115,10 @@ class BringMoveSwap implements Action {
               let text = source.selection.editor.document.getText(
                 source.selection.selection
               );
-              const selectionContext =
-                destination.selectionType === "strictHere"
-                  ? source.selectionContext
-                  : destination.selectionContext;
+              const selectionContext = destination.selectionContext
+                .isRawSelection
+                ? source.selectionContext
+                : destination.selectionContext;
               return i > 0 && selectionContext.containingListDelimiter
                 ? selectionContext.containingListDelimiter + text
                 : text;

src/core/inferFullTargets.ts

@@ -94,9 +94,11 @@ function inferPrimitiveTarget(
   previousTargets: PartialTarget[],
   actionPreferences: ActionPreferences
 ): PrimitiveTarget {
-  const previousTargetsForAttributes = hasContent(target)
-    ? []
-    : previousTargets;
+  const doAttributeInference = !hasContent(target) && !target.isImplicit;
+
+  const previousTargetsForAttributes = doAttributeInference
+    ? previousTargets
+    : [];
 
   const maybeSelectionType =
     target.selectionType ??
@@ -117,7 +119,7 @@ function inferPrimitiveTarget(
 
   const selectionType =
     maybeSelectionType ??
-    (target.modifier == null ? actionPreferences.selectionType : null) ??
+    (doAttributeInference ? actionPreferences.selectionType : null) ??
     "token";
 
   const insideOutsideType =
@@ -127,7 +129,7 @@ function inferPrimitiveTarget(
 
   const modifier = target.modifier ??
     getPreviousAttribute(previousTargetsForAttributes, "modifier") ??
-    (target.selectionType == null ? actionPreferences.modifier : null) ?? {
+    (doAttributeInference ? actionPreferences.modifier : null) ?? {
       type: "identity",
     };
 
@@ -138,6 +140,7 @@ function inferPrimitiveTarget(
     position,
     insideOutsideType,
     modifier,
+    isImplicit: target.isImplicit ?? false,
   };
 }
 

src/processTargets/index.ts

@@ -274,6 +274,13 @@ function processPrimitiveTarget(
     ({ selection, context: selectionContext }) =>
       processSelectionType(context, target, selection, selectionContext)
   );
+
+  if (target.isImplicit) {
+    typedSelections.forEach((typedSelection) => {
+      typedSelection.selectionContext.isRawSelection = true;
+    });
+  }
+
   return typedSelections.map((selection) =>
     processPosition(context, target, selection)
   );

src/processTargets/modifiers/processModifier.ts

@@ -10,6 +10,7 @@ import {
   NodeMatcher,
   PrimitiveTarget,
   ProcessedTargetsContext,
+  RawSelectionModifier,
   SelectionContext,
   SelectionWithEditor,
   SubTokenModifier,
@@ -52,6 +53,14 @@ export default function (
     case "surroundingPair":
       result = processSurroundingPair(context, selection, modifier);
       break;
+
+    case "toRawSelection":
+      result = processRawSelectionModifier(context, selection, modifier);
+      break;
+
+    default:
+      // Make sure we haven't missed any cases
+      const neverCheck: never = modifier;
   }
 
   if (result == null) {
@@ -233,3 +242,16 @@ export function findNearestContainingAncestorNode(
 
   return null;
 }
+
+function processRawSelectionModifier(
+  context: ProcessedTargetsContext,
+  selection: SelectionWithEditor,
+  modifier: RawSelectionModifier
+): SelectionWithEditorWithContext[] | null {
+  return [
+    {
+      selection,
+      context: { isRawSelection: true },
+    },
+  ];
+}

src/processTargets/processSelectionType.ts

@@ -33,8 +33,6 @@ export default function (
       return processLine(target, selection, selectionContext);
     case "paragraph":
       return processParagraph(target, selection, selectionContext);
-    case "strictHere":
-      return processStrictHere(target, selection, selectionContext);
   }
 }
 

src/typings/Types.ts

@@ -184,13 +184,7 @@ export type Modifier =
 
 export type SelectionType =
   //   | "character" Not implemented
-  | "token"
-  | "line"
-  | "notebookCell"
-  | "paragraph"
-  | "document"
-  | "column"
-  | "strictHere";
+  "token" | "line" | "notebookCell" | "paragraph" | "document";
 
 export type Position = "before" | "after" | "contents";
 

src/util/canonicalizeTargets.ts

@@ -52,14 +52,15 @@ const STRICT_HERE = {
   insideOutsideType: "inside",
 };
 
+const IMPLICIT_TARGET: PartialPrimitiveTarget = {
+  type: "primitive",
+  isImplicit: true,
+};
+
 const upgradeStrictHere = (
   target: PartialPrimitiveTarget
 ): PartialPrimitiveTarget =>
-  isDeepStrictEqual(target, STRICT_HERE)
-    ? update(target, {
-        selectionType: () => "strictHere",
-      })
-    : target;
+  isDeepStrictEqual(target, STRICT_HERE) ? IMPLICIT_TARGET : target;
 
 export default function canonicalizeTargets(partialTargets: PartialTarget[]) {
   return transformPartialPrimitiveTargets(