Merge branch dev into published

BetterThanTomorrow · Sep 3, 2024 · 94835fb · 94835fb
2 parents 5ad8b28 + ef0bcbb
commit 94835fb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.468] - 2024-09-03
+
+- Bump deps.clj to v1.11.3.1463
+- [Prioritize Workspace configured connect sequences over User configured dittos](https://github.com/BetterThanTomorrow/calva/issues/2606)
+
 ## [2.0.467] - 2024-07-14
 
 - Fix: [Test explorer creates a test case each time a keystroke is registered](https://github.com/BetterThanTomorrow/calva/issues/2530)

diff --git a/deps-clj-version b/deps-clj-version
@@ -1 +1 @@
-v1.11.3.1463
+v1.11.4.1474
diff --git a/deps.clj.jar b/deps.clj.jar
diff --git a/docs/site/connect-sequences.md b/docs/site/connect-sequences.md
@@ -47,6 +47,13 @@ A connect sequence configures the following:
 
 The [Calva built-in sequences](https://github.com/BetterThanTomorrow/calva/blob/published/src/nrepl/connectSequence.ts) also use this format, check them out to get a clearer picture of how these settings work.
 
+!!! Note "How sequence configurations are merged"
+    The sequence configuration, `calva.replConnectSequences` is an array and the sequences in the array will be listed and processed in the order they appear. However, you can configure connect sequences in several places, even if they make most sense on the Workspace level. The configurations are merged in the following order:
+
+    1. Workspace Folder settings
+    1. Workspace settings
+    1. User settings
+
 !!! Note "Force the project type menu to show"
     The convenience of `autoSelectForJackIn/Connect` can be an inconvenience when you want to use another project type/sequence for a project. For this reason, the `calva.connect` and `calva.jackIn` can be provided with an option `disableAutoSelect`, which forces the project root and project type menus to show. See [Options for the Connect Command](connect.md#options-for-the-jack-in-command) and [Options for the Jack-in Command](connect.md#options-for-the-connect-command) for more on this.
 

diff --git a/package-lock.json b/package-lock.json
diff --git 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.467",
+  "version": "2.0.468",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",

diff --git a/src/config.ts b/src/config.ts
@@ -183,9 +183,9 @@ function getConfig() {
   const replConnectSequencesConfig =
     configOptions.inspect<ReplConnectSequence[]>('replConnectSequences');
   const replConnectSequences = [
-    ...(replConnectSequencesConfig.globalValue ?? []),
-    ...(replConnectSequencesConfig.workspaceValue ?? []),
     ...(replConnectSequencesConfig.workspaceFolderValue ?? []),
+    ...(replConnectSequencesConfig.workspaceValue ?? []),
+    ...(replConnectSequencesConfig.globalValue ?? []),
   ].map((sequence) => {
     if (Array.isArray(sequence.afterCLJReplJackInCode)) {
       return {

diff --git a/test-data/.vscode/settings.json b/test-data/.vscode/settings.json
@@ -75,6 +75,7 @@
       "projectType": "deps.edn",
       "projectRootPath": ["projects/pirate-lang"],
       "afterCLJReplJackInCode": ["(require 'repl)", "(println 1)", "(println 2)"],
+      // "autoSelectForJackIn": true,
       "cljsType": "none",
       "menuSelections": {
         "cljAliases": ["dev", "test"]