diff --git a/.circleci/config.yml b/.circleci/config.yml index e21736105..4449657a6 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: @@ -259,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 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e0e6892..d96ec0f8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,13 @@ 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 -- 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 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", 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'], /** 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