Merge pull request #1346 from BetterThanTomorrow/1345-top-level-deref

Fix select top level deref in comment

CHANGELOG.md

@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- [Select top level form fails for top level derefs in comment forms](https://github.com/BetterThanTomorrow/calva/issues/1345)
 
 ## [2.0.217] - 2021-10-17
 - [Support setting the cider-nrepl print-fn to whatever](https://github.com/BetterThanTomorrow/calva/issues/1340)

src/cursor-doc/token-cursor.ts

@@ -432,7 +432,7 @@ export class LispTokenCursor extends TokenCursor {
     backwardListOfType(openingBracket: string): boolean {
         let cursor = this.clone();
         while (cursor.backwardList()) {
-            if (cursor.getPrevToken().raw === openingBracket) {
+            if (cursor.getPrevToken().raw.endsWith(openingBracket)) {
                 this.set(cursor);
                 return true;
             }
@@ -610,6 +610,7 @@ export class LispTokenCursor extends TokenCursor {
     rangeForDefun(offset: number, commentCreatesTopLevel = true): [number, number] {
         const cursor = this.doc.getTokenCursor(offset);
         let lastCandidateRange: [number, number] = cursor.rangeForCurrentForm(offset);
+        console.log(lastCandidateRange);
         while (cursor.forwardList() && cursor.upList()) {
             const commentCursor = cursor.clone();
             commentCursor.backwardDownList();

src/extension-test/unit/cursor-doc/token-cursor-test.ts

@@ -500,6 +500,12 @@ describe('Token Cursor', () => {
             const cursor: LispTokenCursor = a.getTokenCursor(0);
             expect(cursor.rangeForDefun(a.selectionLeft)).toEqual(textAndSelection(b)[1]);
         });
+        it('Finds top level form when deref in comment', () => {
+            const a = docFromTextNotation('(comment @(foo [bar|]))');
+            const b = docFromTextNotation('(comment |@(foo [bar])|)');
+            const cursor: LispTokenCursor = a.getTokenCursor(0);
+            expect(cursor.rangeForDefun(a.selectionLeft)).toEqual(textAndSelection(b)[1]);
+        })
     });
 
     describe('Location State', () => {

test-data/select.clj

@@ -0,0 +1,3 @@
+(comment
+  @(rf/subscribe [:foo])
+  )