Bugfix: subsection motions can move by start without skipping a subse…

…ction (#55) Some subection motion would previously skip selecting the current section when `selectWhole = true`, `value = 1` and `unit = 'start'`. This fixes the issue by always checking if we need the unit boundary that occurs just before the cursor when resolving the unit boundaries.
haberdashPI · Sep 19, 2024 · b115c42 · b115c42
1 parent 5eb4026
commit b115c42
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "publisher": "haberdashPI",
   "repository": "https://github.com/haberdashPI/vscode-selection-utilities",
   "description": "Kakaune-inspired collection of useful commands for manipulating selections.",
-  "version": "0.6.7",
+  "version": "0.6.6",
   "icon": "logo.png",
   "engines": {
     "vscode": "^1.92.0"
@@ -465,4 +465,4 @@
     "@wdio/spec-reporter": "^8.40.3",
     "ts-node": "^10.9.2"
   }
-}
+}
diff --git a/src/web/unitMotions.ts b/src/web/unitMotions.ts
@@ -439,7 +439,7 @@ function* resolveUnitBoundaries(
 ): Generator<Range> {
     let backwards: Generator<Range>;
     function* resolveHelper(firstUnit: Range, back: Range): Generator<Range> {
-        if (resolve === Boundary.Start && (!firstUnit?.start || !forward)) {
+        if (resolve === Boundary.Start) {
             if (forward) {
                 if (!firstUnit?.start) {
                     firstUnit = fuseRanges(firstUnit, back);
@@ -465,7 +465,7 @@ function* resolveUnitBoundaries(
                 }
                 yield firstUnit;
             }
-        } else if (resolve === Boundary.End && (!firstUnit?.end || forward)) {
+        } else if (resolve === Boundary.End) {
             if (!forward) {
                 if (!firstUnit?.end) {
                     firstUnit = fuseRanges(firstUnit, back);

diff --git a/test/specs/moveBySection.ux.mts b/test/specs/moveBySection.ux.mts
@@ -97,6 +97,18 @@ describe('Section Motion', () => {
 
             `
         );
+
+        await editor.moveCursor(10, 1);
+        await parMoveSelects(
+            {selectWhole: true, boundary: 'start'},
+            `# B
+            # --------------------
+
+            billybob
+            bim
+
+            `
+        );
     });
 
     it('Can move by end', async () => {
@@ -117,6 +129,19 @@ describe('Section Motion', () => {
             # B
             # --------------------`
         );
+
+        await editor.moveCursor(9, 1);
+
+        await parMoveSelects(
+            {selectWhole: true, boundary: 'end'},
+            `
+
+            billybob
+            bim
+
+            # A.2
+            # --------------------`
+        );
     });
 
     it('Can move backwards by start', async () => {
@@ -137,6 +162,17 @@ describe('Section Motion', () => {
     it('Can move backwards by end', async () => {
         await editor.moveCursor(9, 1);
 
+        await parMoveSelects(
+            {selectWhole: true, boundary: 'end', value: -1},
+            `
+
+            billybob
+            bim
+
+            # A.2
+            # --------------------`
+        );
+
         await parMoveSelects(
             {selectWhole: true, boundary: 'end', value: -1},
             `