Fix find current form when squeezed between ignore and list

BetterThanTomorrow · Apr 22, 2024 · 271af11 · 271af11
1 parent 594d7f0
commit 271af11
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/cursor-doc/token-cursor.ts b/src/cursor-doc/token-cursor.ts
@@ -653,6 +653,7 @@ export class LispTokenCursor extends TokenCursor {
         cursor.getToken().type !== 'reader' &&
         !cursor.tokenBeginsMetadata() &&
         cursor.getPrevToken().type !== 'reader' &&
+        cursor.getPrevToken().type !== 'ignore' &&
         !cursor.prevTokenBeginsMetadata()
       ) {
         if (cursor.backwardSexp() && !cursor.tokenBeginsMetadata()) {

diff --git a/src/extension-test/unit/cursor-doc/token-cursor-test.ts b/src/extension-test/unit/cursor-doc/token-cursor-test.ts
@@ -747,6 +747,18 @@ describe('Token Cursor', () => {
       const cursor: LispTokenCursor = a.getTokenCursor(a.selections[0].anchor);
       expect(cursor.rangeForCurrentForm(a.selections[0].anchor)).toBeUndefined();
     });
+    it('Selects atomic form to the right, when squeezed by an ignore marker', () => {
+      const a = docFromTextNotation('#_|a');
+      const b = docFromTextNotation('#_|a|');
+      const cursor: LispTokenCursor = a.getTokenCursor(a.selections[0].anchor);
+      expect(cursor.rangeForCurrentForm(a.selections[0].anchor)).toEqual(textAndSelection(b)[1]);
+    });
+    it('Selects list form to the right, when squeezed by an ignore marker', () => {
+      const a = docFromTextNotation('#_|(a)');
+      const b = docFromTextNotation('#_|(a)|');
+      const cursor: LispTokenCursor = a.getTokenCursor(a.selections[0].anchor);
+      expect(cursor.rangeForCurrentForm(a.selections[0].anchor)).toEqual(textAndSelection(b)[1]);
+    });
   });
 
   describe('Top Level Form', () => {