Merge branch dev into published

Author: PEZ

CHANGELOG.md

@@ -4,6 +4,10 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.540] - 2025-11-06
+
+- Fix: [Interrupting evaluations looks like it succeeds even when it is not supported by the host platform](https://github.com/BetterThanTomorrow/calva/issues/2961)
+
 ## [2.0.539] - 2025-10-28
 
 - [Use latest version of libs for Jack-in, if no specific version was set by the user](https://github.com/BetterThanTomorrow/calva/issues/2959)

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

package.json

@@ -28,32 +28,76 @@ function initInspectorDataProvider() {
   return inspectorDataProvider;
 }
 
-function interruptAllEvaluations() {
-  if (util.getConnectedState()) {
-    const msgs: string[] = [];
-    const nums = NReplEvaluation.interruptAll((msg) => {
-      msgs.push(msg);
-    });
-    if (msgs.length) {
-      output.appendLineOtherOut(msgs.join('\n'));
-    }
-    try {
-      NReplSession.getInstances().forEach((session, _index) => {
-        session.interruptAll();
-      });
-    } catch (error) {
-      // TODO: Figure out why we never get here.
-      console.error(error);
-    }
-    if (nums > 0) {
-      void vscode.window.showInformationMessage(`Interrupted ${nums} running evaluation(s).`);
-    } else {
-      void vscode.window.showInformationMessage('Interruption command finished (unknown results)');
-    }
-    outputWindow.discardPendingPrints();
+async function getJavaVersion(session: NReplSession): Promise<number | null> {
+  try {
+    const result = await session.eval('(System/getProperty "java.version")', 'user').value;
+    // Parse version like "21.0.1", "17.0.2", "1.8.0_292"
+    const match = result.match(/^"(\d+)/);
+    return match ? parseInt(match[1], 10) : null;
+  } catch (error) {
+    console.error('Failed to get Java version:', error);
+    return null;
+  }
+}
+
+async function checkJvmAttachSelfSupport(session: NReplSession): Promise<boolean> {
+  try {
+    const result = await session.eval('(System/getProperty "jdk.attach.allowAttachSelf")', 'user')
+      .value;
+    // 'nil' means not set, any other value means enabled
+    return result !== 'nil';
+  } catch (error) {
+    console.error('Failed to check jdk.attach.allowAttachSelf:', error);
+    return false;
+  }
+}
+
+async function interruptAllEvaluations() {
+  if (!util.getConnectedState()) {
+    void vscode.window.showInformationMessage('Not connected to a REPL server');
+    return;
+  }
+
+  const firstSession = NReplSession.getInstances()?.[0];
+  if (!firstSession?.supports('interrupt')) {
+    void vscode.window.showInformationMessage(
+      'The nREPL server does not support interruption of evaluations.'
+    );
     return;
   }
-  void vscode.window.showInformationMessage('Not connected to a REPL server');
+
+  const javaVersion = await getJavaVersion(firstSession);
+  if (javaVersion !== null && javaVersion >= 21) {
+    const attachSelfEnabled = await checkJvmAttachSelfSupport(firstSession);
+    if (!attachSelfEnabled) {
+      void vscode.window.showWarningMessage(
+        'Interrupt may not work: JVM property jdk.attach.allowAttachSelf is not set. ' +
+          'Add `-Djdk.attach.allowAttachSelf` to your JVM options.'
+      );
+    }
+  }
+
+  const msgs: string[] = [];
+  const nums = NReplEvaluation.interruptAll((msg) => {
+    msgs.push(msg);
+  });
+  if (msgs.length) {
+    output.appendLineOtherOut(msgs.join('\n'));
+  }
+  try {
+    NReplSession.getInstances().forEach((session, _index) => {
+      session.interruptAll();
+    });
+  } catch (error) {
+    // TODO: Figure out why we never get here.
+    console.error(error);
+  }
+  if (nums > 0) {
+    void vscode.window.showInformationMessage(`Interrupted ${nums} running evaluation(s).`);
+  } else {
+    void vscode.window.showInformationMessage('Interruption command finished (unknown results)');
+  }
+  outputWindow.discardPendingPrints();
 }
 
 async function addAsComment(

src/evaluate.ts

@@ -88,7 +88,7 @@
       // "autoSelectForConnect": true,
       "cljsType": "none",
       "menuSelections": {
-        "cljAliases": ["dev", "test"]
+        "cljAliases": ["dev", "test", "allow-attach-self"]
       }
     },
     {

test-data/.vscode/settings.json

@@ -5,6 +5,7 @@
   :test {:extra-paths ["test"]
          :extra-deps {org.clojure/test.check {:mvn/version "0.10.0"}}}
   :dev {:extra-paths ["env/dev"]}
+  :allow-attach-self {:jvm-opts ["-Djdk.attach.allowAttachSelf"]}
   :runner
   {:extra-deps {com.cognitect/test-runner
                 {:git/url "https://github.com/cognitect-labs/test-runner"