Merge branch 'dev' into wip/userConfigEdn

Author: jeff66ruan

.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:
@@ -366,8 +362,8 @@ jobs:
       - run:
           name: Install mkdocs and mkdocs-material
           command: |
-            pip install mkdocs
-            pip install pillow cairosvg
+            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

@@ -5,6 +5,9 @@ Changes to Calva.
 ## [Unreleased]
 
 - 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
+- Fix: [Drag sexps in value part of doseq sometimes jumps 2 sexps instead of 1](https://github.com/BetterThanTomorrow/calva/issues/1914)
 
 ## [2.0.310] - 2022-10-24
 

deps-clj-version

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

deps.clj.jar

@@ -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/cursor-doc/paredit.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', () => {