Merge branch dev into published

Author: PEZ

CHANGELOG.md

@@ -4,6 +4,11 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.586] - 2026-05-09
+
+- Fix: [Prevent calva from breaking other debugging session](https://github.com/BetterThanTomorrow/calva/pull/2936)
+- [Add built-in Glojure Jack-in and Connect Sequences](https://github.com/BetterThanTomorrow/calva/issues/3103)
+
 ## [2.0.585] - 2026-05-08
 
 - Fix: [clojure-lsp fails to start when the latest version cannot be downloaded](https://github.com/BetterThanTomorrow/calva/issues/3211)

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.585",
+  "version": "2.0.586",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",
@@ -102,6 +102,7 @@
           ".boot",
           ".bb",
           ".lg",
+          ".glj",
           ".ly",
           ".lpy",
           ".jank",
@@ -738,6 +739,7 @@
                   "enum": [
                     "Leiningen",
                     "deps.edn",
+                    "clj-projectless",
                     "shadow-cljs",
                     "lein-shadow",
                     "Gradle",
@@ -746,11 +748,11 @@
                     "scittle",
                     "squint",
                     "basilisp",
-                    "let-go",
                     "epupp",
                     "joyride",
+                    "let-go",
+                    "glojure",
                     "generic",
-                    "clj-projectless",
                     "custom",
                     "cljs-only"
                   ]

package.json

@@ -454,7 +454,15 @@ class CalvaDebugAdapterDescriptorFactory implements vscode.DebugAdapterDescripto
   }
 }
 
+function calvaDebugSession(session: vscode.DebugSession) {
+  return session?.type === CALVA_DEBUG_CONFIGURATION.type;
+}
+
 function onNreplMessage(data: any): void {
+  if (!calvaDebugSession(vscode.debug.activeDebugSession)) {
+    return;
+  }
+
   if (vscode.debug.activeDebugSession && (data['value'] || data['err'])) {
     annotations.clearAllEvaluationDecorations();
     void vscode.debug.activeDebugSession.customRequest(REQUESTS.SEND_TERMINATED_EVENT);
@@ -485,7 +493,7 @@ function handleNeedDebugInput(response: any): void {
 }
 
 vscode.debug.onDidStartDebugSession((session) => {
-  if (session.type != CALVA_DEBUG_CONFIGURATION.type) {
+  if (!calvaDebugSession(session)) {
     return;
   }
 
@@ -506,6 +514,10 @@ function initializeDebugger(cljSession: nrepl.NReplSession): void {
 }
 
 function terminateDebugSession(): void {
+  if (!calvaDebugSession(vscode.debug.activeDebugSession)) {
+    return;
+  }
+
   if (vscode.debug.activeDebugSession) {
     void vscode.debug.activeDebugSession.customRequest(REQUESTS.SEND_TERMINATED_EVENT);
   }

src/debugger/calva-debug.ts

@@ -8,6 +8,7 @@ enum ProjectTypes {
   'nbb' = 'nbb',
   'basilisp' = 'basilisp',
   'let-go' = 'let-go',
+  'glojure' = 'glojure',
   'joyride' = 'joyride',
   'scittle' = 'scittle',
   'squint' = 'squint',

src/nrepl/connect-sequence-types.ts

@@ -191,6 +191,14 @@ const letGoBuiltIns: csTypes.ReplConnectSequence[] = [
   },
 ];
 
+const glojureBuiltIns: csTypes.ReplConnectSequence[] = [
+  {
+    name: 'glojure',
+    projectType: csTypes.ProjectTypes['glojure'],
+    cljsType: csTypes.CljsTypes.none,
+  },
+];
+
 const epuppBuiltIns: csTypes.ReplConnectSequence[] = [
   {
     name: 'epupp',
@@ -213,6 +221,7 @@ const builtInSequences = {
   nbb: nbbBuiltIns,
   basilisp: basilispBuiltIns,
   'let-go': letGoBuiltIns,
+  glojure: glojureBuiltIns,
   joyride: joyrideBuiltIns,
   scittle: scittleBuiltIns,
   squint: squintBuiltIns,

src/nrepl/connectSequence.ts

@@ -735,6 +735,31 @@ const projectTypes: { [id: string]: ProjectType } = {
       };
     },
   },
+  glojure: {
+    name: 'glojure',
+    cmd: ['glj'],
+    winCmd: ['glj'],
+    processShellUnix: true,
+    processShellWin: true,
+    useWhenExists: [],
+    defaultNReplPortFile: ['.glj-nrepl-port'],
+    defaultReplSessionNames: { primary: 'glj' },
+    defaultFilePatterns: {
+      primary: {
+        'always-claim': ['*.glj'],
+        'is-fallback-for': ['**/*.glj', '**/*.clj'],
+      },
+    },
+    commandLine: async (
+      _connectSequence: connectSequences.ReplConnectSequence,
+      _cljsType: connectSequences.CljsTypes
+    ) => {
+      return {
+        args: ['--nrepl'],
+        substitutions: {},
+      };
+    },
+  },
   joyride: {
     name: 'joyride',
     cmd: [],
@@ -1080,12 +1105,13 @@ export async function detectProjectTypes(): Promise<string[]> {
     'clj-projectless',
     'cljs-only',
     'babashka',
-    'let-go',
     'nbb',
     'joyride',
     'scittle',
     'squint',
     'epupp',
+    'glojure',
+    'let-go',
     'custom',
     'generic',
   ];