Merge branch dev into published

Author: PEZ

CHANGELOG.md

@@ -4,6 +4,10 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.496] - 2025-04-06
+
+- Fix: [Broken characters in "Calva REPL Commands" menu](https://github.com/BetterThanTomorrow/calva/issues/2765)
+
 ## [2.0.495] - 2025-03-24
 
 - [Find calva.exports that are not in a JAR file](https://github.com/BetterThanTomorrow/calva/issues/2762)

bundled/drams-menu/drams-dev.edn

@@ -1,11 +1,11 @@
-[{:title "Create a Getting Started REPL project",
+[{:title "Create a ”Getting Started” REPL project",
   :src "https://raw.githubusercontent.com/BetterThanTomorrow/dram/dev/drams/v2/calva_getting_started",
   :description "An interactive guide introducing you to Calva and Clojure.",
   :extraDetail "Requires Java"}
- {:title "Create a ClojureScript Quick Start Browser Project",
+ {:title "Create a ”ClojureScript Quick Start” Browser Project",
   :src "https://raw.githubusercontent.com/BetterThanTomorrow/dram/dev/drams/v2/calva_cljs_browser_quick_start",
   :extraDetail "Requires Java"}
- {:title "Create a ClojureScript Quick Start Node Project",
+ {:title "Create a ”ClojureScript Quick Start” Node Project",
   :src "https://raw.githubusercontent.com/BetterThanTomorrow/dram/dev/drams/v2/calva_cljs_node_quick_start",
   :extraDetail "Requires Java & Node.js"}
  {:title "Create a mini Clojure project",

bundled/drams-menu/drams-published.edn

@@ -1,11 +1,11 @@
-[{:title "Create a Getting Started REPL project",
+[{:title "Create a ”Getting Started” REPL project",
   :src "https://raw.githubusercontent.com/BetterThanTomorrow/dram/published/drams/v2/calva_getting_started",
   :description "An interactive guide introducing you to Calva and Clojure.",
   :extraDetail "Requires Java"}
- {:title "Create a ClojureScript Quick Start Browser Project",
+ {:title "Create a ”ClojureScript Quick Start” Browser Project",
   :src "https://raw.githubusercontent.com/BetterThanTomorrow/dram/published/drams/v2/calva_cljs_browser_quick_start",
   :extraDetail "Requires Java"}
- {:title "Create a ClojureScript Quick Start Node Project",
+ {:title "Create a ”ClojureScript Quick Start” Node Project",
   :src "https://raw.githubusercontent.com/BetterThanTomorrow/dram/published/drams/v2/calva_cljs_node_quick_start",
   :extraDetail "Requires Java & Node.js"}
  {:title "Create a mini Clojure project",

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.495",
+  "version": "2.0.496",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",

package.json

@@ -11,8 +11,9 @@ import * as testUtil from './util';
 suite('Annotations suite', () => {
   const suite = 'Annotations';
 
-  before(() => {
+  before(async () => {
     testUtil.showMessage(suite, `suite starting!`);
+    await testUtil.ensureOutputDir(testUtil.testDataDir);
   });
 
   after(() => {

src/extension-test/integration/suite/annotations-test.ts

@@ -33,6 +33,8 @@ suite('Jack-in suite', () => {
   before(async () => {
     testUtil.showMessage(suite, `suite starting!`);
     await vscode.workspace.fs.copy(settingsUri, settingsBackupUri, { overwrite: true });
+    // Add this line to ensure output directory exists
+    await testUtil.ensureOutputDir(testUtil.testDataDir);
   });
 
   after(async () => {

src/extension-test/integration/suite/jack-in-test.ts

@@ -104,3 +104,12 @@ export function createVscTextEditorProxy(editor: vscode.TextEditor): vscode.Text
 
   return proxyEditor;
 }
+
+export async function ensureOutputDir(projectPath: string): Promise<void> {
+  const outputDir = path.join(projectPath, '.calva', 'output-window');
+  try {
+    await fs.promises.mkdir(outputDir, { recursive: true });
+  } catch (err) {
+    console.log(`Error creating output directory: ${err}`);
+  }
+}

src/extension-test/integration/suite/util.ts

@@ -527,7 +527,7 @@ export function activate(context: vscode.ExtensionContext) {
   vscode.window.onDidChangeActiveTextEditor(
     (editor) => {
       activeEditor = editor;
-      if (is_clojure(editor)) {
+      if (editor && is_clojure(editor)) {
         scheduleRainbowBrackets();
       }
     },
@@ -537,7 +537,8 @@ export function activate(context: vscode.ExtensionContext) {
 
   vscode.window.onDidChangeTextEditorSelection(
     (event) => {
-      if (event.textEditor === tryToGetActiveTextEditor() && is_clojure(event.textEditor)) {
+      const activeEditor = tryToGetActiveTextEditor();
+      if (activeEditor && event.textEditor === activeEditor && is_clojure(event.textEditor)) {
         if (lastHighlightedEditor !== event.textEditor) {
           scheduleRainbowBrackets();
         } else {
@@ -547,7 +548,10 @@ export function activate(context: vscode.ExtensionContext) {
           matchTimer = setTimeout(() => {
             matchPairs();
             if (highlightActiveIndent && rainbowTypes.length) {
-              decorateActiveGuides();
+              const activeEditor = tryToGetActiveTextEditor();
+              if (activeEditor) {
+                decorateActiveGuides();
+              }
             }
           }, 16);
         }

src/highlight/src/extension.ts

@@ -454,12 +454,9 @@ function sortByPresetOrder(arr: any[], presetOrder: any[]) {
 }
 
 function writeTextToFile(uri: vscode.Uri, text: string): Thenable<void> {
-  const ab = new ArrayBuffer(text.length);
-  const ui8a = new Uint8Array(ab);
-  for (let i = 0, strLen = text.length; i < strLen; i++) {
-    ui8a[i] = text.charCodeAt(i);
-  }
-  return vscode.workspace.fs.writeFile(uri, ui8a);
+  const encoder = new TextEncoder();
+  const uint8Array = encoder.encode(text);
+  return vscode.workspace.fs.writeFile(uri, uint8Array);
 }
 
 async function downloadFromUrl(fileUrl: string, savePath: string) {