Merge branch 'dev' into published

Author: PEZ

.circleci/config.yml

@@ -118,10 +118,6 @@ jobs:
     environment:
       # Required:
       DISPLAY: ':99'
-      # Configurable
-      ATOM_LINT_WITH_BUNDLED_NODE: 'true'
-      APM_TEST_PACKAGES: ''
-      ATOM_CHANNEL: 'stable'
     docker:
       - image: arcanemagus/atom-docker-ci
     steps:
@@ -367,6 +363,7 @@ jobs:
           name: Install mkdocs and mkdocs-material
           command: |
             pip install -r requirements.txt
+            # Overwrite with insiders version of mkdocs-material
             pip install git+https://${GITHUB_MKDOCS_MATERIAL_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
       - run:
           name: Deploy docs

CHANGELOG.md

@@ -4,6 +4,14 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.311] - 2022-10-27
+
+- Fix: [Drag sexps in value part of doseq sometimes jumps 2 sexps instead of 1](https://github.com/BetterThanTomorrow/calva/issues/1914)
+- Fix: [Can't do formatting code from Calva: Fire up the Getting Started REPL on hello_repl.clj](https://github.com/BetterThanTomorrow/calva/issues/1918)
+- Fix: [Calva: Open REPL snippets User config.edn couldn't create the file if parent folders doesn't exist](https://github.com/BetterThanTomorrow/calva/issues/1916)
+- Calva development: [Use requirements.txt in CI for publishing docs](https://github.com/BetterThanTomorrow/calva/issues/1913)
+- Bump deps.clj to v1.11.1.1182
+
 ## [2.0.310] - 2022-10-24
 
 - Calva development: [Refactor `extension.ts` for less boilerplate and improved readability](https://github.com/BetterThanTomorrow/calva/issues/1906)

deps-clj-version

@@ -1 +1 @@
-v1.11.1.1165
+v1.11.1.1182

deps.clj.jar

@@ -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.310",
+  "version": "2.0.311",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",

package-lock.json

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import * as os from 'os';
 import * as fs from 'fs';
+import * as path from 'path';
 import { customREPLCommandSnippet } from './evaluate';
 import { ReplConnectSequence } from './nrepl/connectSequence';
 import { PrettyPrintingOptions } from './printer';
@@ -42,13 +43,13 @@ const userConfigFileUri = vscode.Uri.joinPath(
 );
 
 async function openCalvaConfigEdn() {
-  const configPath = state.resolvePath('.calva/config.edn');
   return fs.promises
     .access(userConfigFileUri.fsPath, fs.constants.F_OK)
     .then(async () => await vscode.window.showTextDocument(userConfigFileUri))
     .catch(async (error) => {
       if (error.code === 'ENOENT') {
         try {
+          await fs.promises.mkdir(path.dirname(userConfigFileUri.fsPath), { recursive: true });
           await fs.promises.writeFile(
             userConfigFileUri.fsPath,
             '{:customREPLHoverSnippets []\n :customREPLCommandSnippets []}'
@@ -58,9 +59,7 @@ async function openCalvaConfigEdn() {
           console.error('Error creating user config.edn', error);
         }
       } else {
-        void vscode.window.showErrorMessage(
-          'Could not find a config.edn file in the workspace. Please create one and try again.'
-        );
+        void vscode.window.showErrorMessage('Could not open user config.edn. ' + error.message);
       }
     });
 }

package.json

@@ -1181,7 +1181,7 @@ function isInPairsList(cursor: LispTokenCursor, pairForms: string[]): boolean {
     if (opening.endsWith('[')) {
       probeCursor.backwardUpList();
       probeCursor.backwardList();
-      if (probeCursor.getPrevToken().raw.endsWith('{')) {
+      if (!probeCursor.getPrevToken().raw.endsWith('(')) {
         return false;
       }
       const fn = probeCursor.getFunctionName();

src/config.ts

@@ -830,6 +830,34 @@ describe('paredit', () => {
         await paredit.dragSexprBackward(a);
         expect(textAndSelection(a)).toEqual(textAndSelection(b));
       });
+
+      it('drags single sexpr forward in bound vectors', async () => {
+        const a = docFromTextNotation(`(b [x [1| 2 3]])`);
+        const b = docFromTextNotation(`(b [x [2 1| 3]])`);
+        await paredit.dragSexprForward(a, ['b']);
+        expect(textAndSelection(a)).toEqual(textAndSelection(b));
+      });
+
+      it('drags single sexpr backward in bound vectors', async () => {
+        const a = docFromTextNotation(`(b [x [1 2 |3]])`);
+        const b = docFromTextNotation(`(b [x [1 |3 2]])`);
+        await paredit.dragSexprBackward(a, ['b']);
+        expect(textAndSelection(a)).toEqual(textAndSelection(b));
+      });
+
+      it('drags single sexpr forward in bound lists', async () => {
+        const a = docFromTextNotation(`(b [x (1 2| 3)])`);
+        const b = docFromTextNotation(`(b [x (1 3 2|)])`);
+        await paredit.dragSexprForward(a, ['b']);
+        expect(textAndSelection(a)).toEqual(textAndSelection(b));
+      });
+
+      it('drags single sexpr backward in bound lists', async () => {
+        const a = docFromTextNotation(`(b [x (1 2 |3)])`);
+        const b = docFromTextNotation(`(b [x (1 |3 2)])`);
+        await paredit.dragSexprBackward(a, ['b']);
+        expect(textAndSelection(a)).toEqual(textAndSelection(b));
+      });
     });
 
     describe('backwardUp - one line', () => {

src/cursor-doc/paredit.ts

@@ -184,7 +184,7 @@ export async function initProjectDir(uri?: vscode.Uri): Promise<void> {
 export function resolvePath(filePath?: string): vscode.Uri {
   const root = getProjectWsFolder();
 
-  if (root.uri.scheme !== 'file') {
+  if (root && root.uri.scheme !== 'file') {
     return vscode.Uri.joinPath(root.uri, filePath);
   }