From e204088c5d7613678aea2e4fe1acb3bbe99697a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Tue, 3 Sep 2024 11:30:33 +0000 Subject: [PATCH 1/8] Bring on version 2.0.469! --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51261a3c7..ae343566f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "calva", - "version": "2.0.468", + "version": "2.0.469", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "calva", - "version": "2.0.468", + "version": "2.0.469", "license": "MIT", "dependencies": { "@vscode/debugadapter": "^1.64.0", diff --git a/package.json b/package.json index 9f67967a3..dd8e3ae6a 100644 --- a/package.json +++ b/package.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.468", + "version": "2.0.469", "publisher": "betterthantomorrow", "author": { "name": "Better Than Tomorrow", From 17f1c6f052197b6464db71e1f81d4e86e1329753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Wed, 4 Sep 2024 10:12:57 +0200 Subject: [PATCH 2/8] Add test-data file for metadata select issue --- test-data/test-files/metadata_toplevel_select_issue.clj | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 test-data/test-files/metadata_toplevel_select_issue.clj diff --git a/test-data/test-files/metadata_toplevel_select_issue.clj b/test-data/test-files/metadata_toplevel_select_issue.clj new file mode 100644 index 000000000..295df9f61 --- /dev/null +++ b/test-data/test-files/metadata_toplevel_select_issue.clj @@ -0,0 +1,2 @@ +(a ^{} b) +c From b2e056c8f695418a440cea4a9d75b1d4466eb3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Wed, 4 Sep 2024 10:16:59 +0200 Subject: [PATCH 3/8] Fix Changelog copy-pasta error with deps.clj version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e0e6892..cfbcfc6f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Changes to Calva. ## [2.0.468] - 2024-09-03 -- Bump deps.clj to v1.11.3.1463 +- Bump deps.clj to v1.11.4.1474 - [Prioritize Workspace configured connect sequences over User configured dittos](https://github.com/BetterThanTomorrow/calva/issues/2606) ## [2.0.467] - 2024-07-14 From fb8c7e15426d2f30b7cd17d306ecf3f6fc3ad299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Sun, 8 Sep 2024 17:32:04 +0200 Subject: [PATCH 4/8] On Windows use + shell = truem + npx instead of npx.cmd * Addressing #2616 --- CHANGELOG.md | 2 ++ src/nrepl/project-types.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfbcfc6f0..d28bbc04c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Changes to Calva. ## [Unreleased] +- Fix: [Windows – Jack-in for shadow-cljs fails to start on Windows with "Error: spawn EINVAL" on the latest VS Code version](https://github.com/BetterThanTomorrow/calva/issues/2616) + ## [2.0.468] - 2024-09-03 - Bump deps.clj to v1.11.4.1474 diff --git a/src/nrepl/project-types.ts b/src/nrepl/project-types.ts index 970743840..379be0c2f 100644 --- a/src/nrepl/project-types.ts +++ b/src/nrepl/project-types.ts @@ -400,9 +400,9 @@ const projectTypes: { [id: string]: ProjectType } = { name: 'shadow-cljs', cljsTypes: [], cmd: ['npx'], - winCmd: ['npx.cmd'], + winCmd: ['npx'], processShellUnix: true, - processShellWin: false, + processShellWin: true, useWhenExists: ['shadow-cljs.edn'], nReplPortFile: ['.shadow-cljs', 'nrepl.port'], /** From 9a677d9b0210479dfba91c411b748a51aeeba380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Tue, 10 Sep 2024 20:38:57 +0200 Subject: [PATCH 5/8] Typo in changelog [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d28bbc04c..3bad76d62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Changes to Calva. ## [Unreleased] -- Fix: [Windows – Jack-in for shadow-cljs fails to start on Windows with "Error: spawn EINVAL" on the latest VS Code version](https://github.com/BetterThanTomorrow/calva/issues/2616) +- Fix: [Windows – Jack-in for shadow-cljs fails to start with "Error: spawn EINVAL" on the latest VS Code version](https://github.com/BetterThanTomorrow/calva/issues/2616) ## [2.0.468] - 2024-09-03 From be6ac6070b883df7b8a5ec3cebb9eda8624b1fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Tue, 10 Sep 2024 20:39:13 +0200 Subject: [PATCH 6/8] Add changelog section for v2.0.469 [skip ci] --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bad76d62..d96ec0f8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Changes to Calva. ## [Unreleased] +## [2.0.469] - 2024-09-10 + - Fix: [Windows – Jack-in for shadow-cljs fails to start with "Error: spawn EINVAL" on the latest VS Code version](https://github.com/BetterThanTomorrow/calva/issues/2616) ## [2.0.468] - 2024-09-03 From d9383a1510edfdaca442983ad6b0c310d8e5578c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Tue, 10 Sep 2024 20:55:56 +0200 Subject: [PATCH 7/8] Remove vscode network log saving --- .circleci/config.yml | 4 ---- .circleci/jobs/test-e2e.yaml | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e21736105..addf2d232 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,10 +237,6 @@ jobs: - run: name: Run VSIX E2E Tests command: npm run e2e-test -- --calva-vsix=/tmp/artifacts/calva-$( node -p 'require("./package.json").version' ).vsix --test-workspace=src/extension-test/e2e-test - - run: - name: Temporary debug preserving of VS Code network log - command: for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do echo "$f"; echo ---; cat "$f"; echo ---; done - when: always - store_test_results: path: ~/calva/junit test-e2e-sub-projects: diff --git a/.circleci/jobs/test-e2e.yaml b/.circleci/jobs/test-e2e.yaml index beb6b2fde..b697fef4c 100644 --- a/.circleci/jobs/test-e2e.yaml +++ b/.circleci/jobs/test-e2e.yaml @@ -26,16 +26,5 @@ steps: ).vsix --test-workspace=src/extension-test/e2e-test -- run: - name: Temporary debug preserving of VS Code network log - command: - for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do - echo "$f"; - echo ---; - cat "$f"; - echo ---; - done - when: always - - !store: test_results: ~/calva/junit From fae7d4c9624989b497d4eb72d109d247d056ecdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Tue, 10 Sep 2024 21:07:50 +0200 Subject: [PATCH 8/8] Remove vscode network log saving from e2e-subprojects run as well --- .circleci/config.yml | 4 ---- .circleci/jobs/test-e2e-sub-projects.yaml | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index addf2d232..4449657a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -255,10 +255,6 @@ jobs: - run: name: Run VSIX E2E Tests for test-data/projects/e2e-sub-projects command: npm run e2e-test -- --calva-vsix=/tmp/artifacts/calva-$( node -p 'require("./package.json").version' ).vsix --test-workspace=test-data/projects/e2e-sub-projects - - run: - name: Temporary debug preserving of VS Code network log - command: for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do echo "$f"; echo ---; cat "$f"; echo ---; done - when: always - store_test_results: path: ~/calva/junit github-release: diff --git a/.circleci/jobs/test-e2e-sub-projects.yaml b/.circleci/jobs/test-e2e-sub-projects.yaml index 24275ccbf..602d0620f 100644 --- a/.circleci/jobs/test-e2e-sub-projects.yaml +++ b/.circleci/jobs/test-e2e-sub-projects.yaml @@ -26,16 +26,5 @@ steps: ).vsix --test-workspace=test-data/projects/e2e-sub-projects -- run: - name: Temporary debug preserving of VS Code network log - command: - for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do - echo "$f"; - echo ---; - cat "$f"; - echo ---; - done - when: always - - !store: test_results: ~/calva/junit