Merge branch dev into published

PEZ · PEZ · commit 329414014537 · 2022-11-10T08:42:53.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.319] - 2022-11-10
+
+- Fix: [The indenter fails matching cljfmt rules on qualified symbols](https://github.com/BetterThanTomorrow/calva/issues/1956)
+- [Add info about cider-nrepl docs to calva.io/connect](https://github.com/BetterThanTomorrow/calva/issues/1955)
+- [Inform about Calva version on startup](https://github.com/BetterThanTomorrow/calva/issues/1954)
+- Fix: [Calva docs site theme color not used](https://github.com/BetterThanTomorrow/calva/issues/1960)
+
 ## [2.0.318] - 2022-11-08
 
 - Fix: [Calva doesn't show action buttons in error message boxes](https://github.com/BetterThanTomorrow/calva/issues/1949)
diff --git a/docs/site/connect.md b/docs/site/connect.md
@@ -66,6 +66,10 @@ All this said, I still recommend you challenge the conclusion that you can't use
 !!! Note
     There is a Calva command for copying the Jack-in command line to the clipboard.
 
+### Starting the REPL from application code?
+
+If your project is setup so that the REPL server is started by the application code, you will need to get the cider-nrepl middleware in place. See the cider-nrepl docs about [embedding nREPL in your application](https://docs.cider.mx/cider-nrepl/usage.html#via-embedding-nrepl-in-your-application).
+
 ## Monorepos / multiple Clojure projects in one workspace
 
 If the workspace is a monorepo, Polylith repo or just a repository with more than one Clojure project, Calva will start the connect sequence with prompting for which project to start/connect to.
diff --git a/docs/site/stylesheets/extra.css b/docs/site/stylesheets/extra.css
@@ -1,4 +1,4 @@
-:root {
+[data-md-color-scheme="default"] {
     --md-primary-fg-color: rgb(219, 149, 80);
     --md-accent-fg-color: rgb(144, 180, 254);
 }
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.318",
+  "version": "2.0.319",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",
diff --git a/src/cljs-lib/src/calva/fmt/formatter.cljs b/src/cljs-lib/src/calva/fmt/formatter.cljs
@@ -5,7 +5,8 @@
             [calva.js-utils :refer [jsify cljify]]
             [calva.fmt.util :as util]
             [calva.parse :refer [parse-clj-edn]]
-            [clojure.string]))
+            [clojure.string]
+            [clojure.core :as c]))
 
 (defn- merge-default-indents
   "Merges onto default-indents.
diff --git a/src/cursor-doc/indent.ts b/src/cursor-doc/indent.ts
@@ -91,7 +91,7 @@ export function collectIndents(
 
       const pattern =
         isList &&
-        _.find(_.keys(rules), (pattern) => pattern === token || testCljRe(pattern, token));
+        _.find(_.keys(rules), (p) => testCljRe(`#"^(.*/)?${p}$"`, token) || testCljRe(p, token));
       const indentRule = pattern ? rules[pattern] : [];
       indents.unshift({
         first: token,
@@ -140,7 +140,7 @@ export function collectIndents(
 
 const testCljRe = (re, str) => {
   const matches = re.match(/^#"(.*)"$/);
-  return matches && RegExp(matches[1]).test(str);
+  return matches && RegExp(matches[1]).test(str.replace(/^.*\//, ''));
 };
 
 /** Returns the expected newline indent for the given position, in characters. */
diff --git a/src/extension.ts b/src/extension.ts
@@ -423,7 +423,6 @@ async function activate(context: vscode.ExtensionContext) {
   greetings.activationGreetings(chan);
 
   if (vimExtension) {
-    chan.appendLine(`VIM Extension detected. Please read: ${VIM_DOC_URL} now and then.\n`);
     if (!context.globalState.get(VIEWED_VIM_DOCS)) {
       void vscode.window
         .showInformationMessage(
diff --git a/src/greet.ts b/src/greet.ts
@@ -35,11 +35,11 @@ export function activationGreetings(chan: vscode.OutputChannel) {
     chan.appendLine(`  clojure-lsp version configured: ${clojureLspVersion}`);
   }
   chan.appendLine('');
-  chan.appendLine('If you are new to Calva, please consider starting with the command:');
-  chan.appendLine('  **Calva: Fire up the Getting Started REPL**');
-  chan.appendLine('  https://calva.io/getting-started/');
+  chan.appendLine('If you are new to Calva, please see: https://calva.io/getting-started/');
+  chan.appendLine('  And please consider the command: **Calva: Fire up the Getting Started REPL**');
   chan.appendLine('');
   chan.appendLine(
-    '(See `showCalvaSaysOnStart` in Settings to control the auto-showing of this message panel.)'
+    'Calva version used: v' +
+      vscode.extensions.getExtension('betterthantomorrow.calva').packageJSON.version
   );
 }
diff --git a/src/lsp/main.ts b/src/lsp/main.ts
@@ -563,7 +563,6 @@ function quickPick(message: string, actions: { title: string }[]): Promise<{ tit
 function sayClientVersionInfo(serverVersion: string, serverInfo: any) {
   const cljKondoVersion = serverInfo['clj-kondo-version'];
   const calvaSaysChannel = state.outputChannel();
-  calvaSaysChannel.appendLine('');
   calvaSaysChannel.appendLine(`clojure-lsp version used: ${serverVersion}`);
   calvaSaysChannel.appendLine(`clj-kondo version used: ${cljKondoVersion}`);
 }
diff --git a/test-data/.vscode/settings.json b/test-data/.vscode/settings.json
@@ -42,5 +42,5 @@
     "titleBar.inactiveBackground": "#90B4FEd5",
     "titleBar.inactiveForeground": "#13172299"
   },
-  "calva.fmt.configPath": "projects/pirate-lang/.cljfmt.edn"
+  "calva.fmt.configPath": "cljfmt.edn"
 }
diff --git a/test-data/cljfmt.edn b/test-data/cljfmt.edn
@@ -0,0 +1 @@
+{:indents {inner-0-form [[:inner 0]]}}
diff --git a/test-data/indenter-cases.clj b/test-data/indenter-cases.clj
@@ -0,0 +1,39 @@
+#_:clj-kondo/ignore
+(ns foo
+  {:clj-kondo/config '{:linters {:unresolved-symbol {:level :off}
+                                 :unused-bindings {:level :off}}}})
+
+; Should indent like `(def ...`
+(foo/defbars body
+  [:body {}])
+
+; Should not indent like `(def ...`
+
+(foo/ddefbars body
+  [:body {}])
+
+
+; Should indent like `(let ...`
+(clojure.core/let [x :x]
+  x)
+
+; Should not indent like `(let ...`
+(clojure.core-let [x :x]
+  x)
+
+; Should indent using `[[:inner 0]]`
+; Assuming a custom `cljfmt.edn` is used and it has:
+; `{:indents {inner-0-form [[:inner 0]]}}`
+(foo/inner-0-form :a
+  ss
+  :foo)
+
+; Should not indent using `[[:inner 0]]`
+(foo-inner-0-form :a
+  ss
+  :foo)
+
+; Should indent like
+(deftype MyType [arg1 arg2]
+  IMyProto 
+  (method1 [this] |(print "hello")))

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-:root {`
	`1`	`+[data-md-color-scheme="default"] {`
`2`	`2`	`--md-primary-fg-color: rgb(219, 149, 80);`
`3`	`3`	`--md-accent-fg-color: rgb(144, 180, 254);`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,6 @@ function quickPick(message: string, actions: { title: string }[]): Promise<{ tit`
`563`	`563`	`function sayClientVersionInfo(serverVersion: string, serverInfo: any) {`
`564`	`564`	`const cljKondoVersion = serverInfo['clj-kondo-version'];`
`565`	`565`	`const calvaSaysChannel = state.outputChannel();`
`566`		`- calvaSaysChannel.appendLine('');`
`567`	`566`	calvaSaysChannel.appendLine(`clojure-lsp version used: ${serverVersion}`);
`568`	`567`	calvaSaysChannel.appendLine(`clj-kondo version used: ${cljKondoVersion}`);
`569`	`568`	`}`