Merge branch dev into published

Author: PEZ

CHANGELOG.md

@@ -4,6 +4,10 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.538] - 2025-10-19
+
+- Fix: [Semantic tokens fail on some input with ignored forms](https://github.com/BetterThanTomorrow/calva/issues/2956)
+
 ## [2.0.537] - 2025-10-15
 
 - [Add "Wrap Around #{}" paredit command](https://github.com/BetterThanTomorrow/calva/issues/2949)

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "Calva: Clojure & ClojureScript Interactive Programming",
   "description": "Integrated REPL, formatter, Paredit, and more. Powered by cider-nrepl and clojure-lsp.",
   "icon": "assets/calva.png",
-  "version": "2.0.537",
+  "version": "2.0.538",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",

package.json

@@ -392,4 +392,28 @@ describe('Semantic token filtering', () => {
       0, // [foo] preserved relative
     ]);
   });
+  it('handles comment as first token with delta accumulation', () => {
+    // Two tokens: first is a comment (type 10), second is not (type 0)
+    // Should remove the comment and accumulate its deltaLine (3) into token 2's deltaLine (2)
+    const input = [
+      3, // Token 1: deltaLine
+      0, // Token 1: deltaStart
+      4, // Token 1: length
+      10, // Token 1: tokenType (comment)
+      0, // Token 1: modifiers
+      2, // Token 2: deltaLine
+      4, // Token 2: deltaStart
+      3, // Token 2: length
+      0, // Token 2: tokenType (namespace)
+      0, // Token 2: modifiers
+    ];
+    const expected = [
+      5, // deltaLine (3 + 2, accumulated from removed comment)
+      4, // deltaStart
+      3, // length
+      0, // tokenType
+      0, // modifiers
+    ];
+    expect(filterCommentTokens(new Uint32Array(input), 10)).toEqual(expected);
+  });
 });

src/extension-test/unit/lsp/semantic-token-filter-test.ts

@@ -17,7 +17,7 @@ export function filterCommentTokens(data: Uint32Array, remove: number) {
     }
 
     filteredData.push(
-      filteredData.length === 0 ? deltaLine : deltaLine + accumulatedDeltaLine,
+      accumulatedDeltaLine === 0 ? deltaLine : deltaLine + accumulatedDeltaLine,
       deltaStart,
       length,
       tokenType,

src/lsp/client/semantic-token-filter.ts

@@ -0,0 +1,6 @@
+;
+;
+; 0123456789
+#_()
+;
+(ns foo)