#610 Multi Cursor for paredit

.vscode/settings.json

@@ -7,10 +7,12 @@
     "ahlbrecht",
     "alnum",
     "Alsos",
+    "analyse",
     "analysing",
     "arglist",
     "arglists",
     "autoindent",
+    "avli",
     "Batsov",
     "behaviour",
     "bencode",
@@ -24,11 +26,15 @@
     "calva",
     "Calva's",
     "calvapretty",
+    "ccls",
     "chmod",
     "cibuilds",
     "circleci",
+    "clangd",
     "classpath",
+    "clientrc",
     "cljc",
+    "cljd",
     "cljfmt",
     "cljfx",
     "cljify",
@@ -44,7 +50,9 @@
     "Cognitect",
     "Configurability",
     "cospaia",
+    "cpcache",
     "Dallo",
+    "darcs",
     "datafication",
     "debugable",
     "debugadapter",
@@ -68,10 +76,12 @@
     "Elisp",
     "enablement",
     "enablements",
+    "ensime",
     "entrypoint",
     "errored",
     "ESPACEIALLY",
     "être",
+    "eunit",
     "eval",
     "evals",
     "falsesomething",
@@ -82,6 +92,7 @@
     "filipe",
     "fipp",
     "foob",
+    "fslckout",
     "FUBAR",
     "gifs",
     "Girardi",
@@ -139,6 +150,7 @@
     "parinfer",
     "pidfile",
     "piggieback",
+    "pijul",
     "polyrepos",
     "postrelease",
     "pprint",
@@ -189,6 +201,7 @@
     "unpromote",
     "unpromoted",
     "unsets",
+    "uuidv",
     "visibles",
     "vsce",
     "vscodevim",

CHANGELOG.md

@@ -3,13 +3,17 @@
 Changes to Calva.
 
 ## [Unreleased]
+- [Multi cursor support for Paredit](https://github.com/BetterThanTomorrow/calva/issues/610)
+- [Remove when-contexts as a way to control when commands move by sexp or by word](https://github.com/BetterThanTomorrow/calva/pull/1606#issuecomment-1086567905)
 
 ## [2.0.267] - 2022-04-13
 - [Add command for formatting away multiple space between forms on the same line](https://github.com/BetterThanTomorrow/calva/issues/1677)
 - [Merge LSP + NREPL completions and goToDefintion](https://github.com/BetterThanTomorrow/calva/issues/1498)
 
 ## [2.0.266] - 2022-04-11
 - Fix: [Jump between source/test does not work properly with multiple workspace folders](https://github.com/BetterThanTomorrow/calva/issues/1219)
+- [New diagnostics command, Print TextNotation from current document](https://github.com/BetterThanTomorrow/calva/issues/1675) (See [this CalvaTV video](https://www.youtube.com/watch?v=Sy3arG-Degw))
+- [New diagnostics command, Create untitled document from TextNotation](https://github.com/BetterThanTomorrow/calva/issues/1676)
 
 ## [2.0.265] - 2022-04-08
 - [Update paredit sexp forward/backward command labels](https://github.com/BetterThanTomorrow/calva/issues/1660)

docs/site/customizing.md

@@ -75,7 +75,7 @@ The versions used are configurable via the VS Code settings `calva.jackInDepende
 
 ## Key bindings
 
-Most of Calva's commands have default keybindings. They are only defaults, though, and you can change keybindings as you wish. To facilitate precision in binding keys Calva keeps some [when clause contexts](https://code.visualstudio.com/api/references/when-clause-contexts) updated. 
+Most of Calva's commands have default keybindings. They are only defaults, though, and you can change keybindings as you wish. To facilitate precision in binding keys Calva keeps some [when clause contexts](https://code.visualstudio.com/api/references/when-clause-contexts) updated.
 
 ### When Clause Contexts
 
@@ -87,15 +87,15 @@ The following contexts are available with Calva:
 * `calva:outputWindowActive`: `true` when the [Output/REPL window](output.md) has input focus
 * `calva:replHistoryCommandsActive`: `true` when the cursor is in the Output/REPL window at the top level after the last prompt
 * `calva:outputWindowSubmitOnEnter`: `true` when the cursor is adjacent after the last top level form in the Output/REPL window
-* `calva:cursorInString`: `true` when the cursor/caret is in a string or a regexp
-* `calva:cursorInComment`: `true` when the cursor is in, or adjacent to a line comment
-* `calva:cursorBeforeComment`: `true` when the cursor is adjacent before a line comment
-* `calva:cursorAfterComment`: `true` when the cursor is adjacent after a line comment
-* `calva:cursorAtStartOfLine`: `true` when the cursor is at the start of a line including any leading whitespace
-* `calva:cursorAtEndOfLine`: `true` when the cursor is at the end of a line including any trailing whitespace
+<!-- * `calva:cursorInString`: `true` when the cursor/caret is in a string or a regexp -->
+<!-- * `calva:cursorInComment`: `true` when the cursor is in, or adjacent to a line comment -->
+<!-- * `calva:cursorBeforeComment`: `true` when the cursor is adjacent before a line comment -->
+<!-- * `calva:cursorAfterComment`: `true` when the cursor is adjacent after a line comment -->
+<!-- * `calva:cursorAtStartOfLine`: `true` when the cursor is at the start of a line including any leading whitespace -->
+<!-- * `calva:cursorAtEndOfLine`: `true` when the cursor is at the end of a line including any trailing whitespace -->
 * `calva:showReplUi`: `false` when Calva's REPL UI is disabled through the corresponding setting
 
-### Some Custom Bindings 
+### Some Custom Bindings
 
 Here is a collection of custom keybindings from here and there.
 

package.json

@@ -169,7 +169,7 @@
               },
               "printEngine": {
                 "type": "string",
-                "description": "The print engine to use. 'calva' means that the nREPL server will first plain print it and then Calva will prettify. The other options will make the server use the chosen printer-function to print the result, and Calva will not reformat it. To use some other function (on the server), configure `printFn` instead. To use the `nREPL` default (the equivalent of `clojure.core/pr`), set neither this nore `printFn`.",
+                "description": "The print engine to use. 'calva' means that the nREPL server will first plain print it and then Calva will prettify. The other options will make the server use the chosen printer-function to print the result, and Calva will not reformat it. To use some other function (on the server), configure `printFn` instead. To use the `nREPL` default (the equivalent of `clojure.core/pr`), set neither this nor `printFn`.",
                 "enum": [
                   "calva",
                   "pprint",
@@ -917,6 +917,16 @@
         "title": "Toggle nREPL Logging Enabled",
         "category": "Calva Diagnostics"
       },
+      {
+        "command": "calva.diagnostics.printTextNotationFromDocument",
+        "title": "Print TextNotation from the current document to Calva says",
+        "category": "Calva Diagnostics"
+      },
+      {
+        "command": "calva.diagnostics.createDocumentFromTextNotation",
+        "title": "Create a new Clojure Document from TextNotation",
+        "category": "Calva Diagnostics"
+      },
       {
         "command": "calva.linting.resolveMacroAs",
         "title": "Resolve Macro As",
@@ -1895,28 +1905,28 @@
         "mac": "ctrl+left",
         "win": "alt+left",
         "linux": "alt+left",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorBeforeComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults"
       },
       {
         "command": "paredit.backwardSexp",
         "mac": "alt+left",
         "win": "ctrl+left",
         "linux": "ctrl+left",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorBeforeComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults"
       },
       {
         "command": "paredit.forwardSexp",
         "mac": "ctrl+right",
         "win": "alt+right",
         "linux": "alt+right",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorAfterComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults"
       },
       {
         "command": "paredit.forwardSexp",
         "mac": "alt+right",
         "win": "ctrl+right",
         "linux": "ctrl+right",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorAfterComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults"
       },
       {
         "command": "paredit.forwardDownSexp",
@@ -2009,14 +2019,14 @@
         "mac": "ctrl+w",
         "win": "shift+alt+right",
         "linux": "shift+alt+right",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/"
       },
       {
         "command": "paredit.sexpRangeContraction",
         "mac": "ctrl+shift+w",
         "win": "shift+alt+left",
         "linux": "shift+alt+left",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/"
       },
       {
         "command": "paredit.slurpSexpForward",
@@ -2068,22 +2078,22 @@
       {
         "command": "paredit.dragSexprBackward",
         "key": "ctrl+shift+alt+b",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/"
       },
       {
         "command": "paredit.dragSexprForward",
         "key": "ctrl+shift+alt+f",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/"
       },
       {
         "command": "paredit.dragSexprBackward",
         "key": "alt+up",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /strict/ && config.calva.paredit.hijackVSCodeDefaults"
       },
       {
         "command": "paredit.dragSexprForward",
         "key": "alt+down",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /strict/ && config.calva.paredit.hijackVSCodeDefaults"
       },
       {
         "command": "paredit.dragSexprBackwardUp",
@@ -2190,12 +2200,12 @@
       {
         "command": "paredit.deleteForward",
         "key": "delete",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap == strict && !editorReadOnly && !editorHasMultipleSelections && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap == strict && !editorReadOnly && !editorHasMultipleSelections"
       },
       {
         "command": "paredit.deleteBackward",
         "key": "backspace",
-        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap == strict && !editorReadOnly && !editorHasMultipleSelections && !calva:cursorInComment"
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap == strict && !editorReadOnly && !editorHasMultipleSelections"
       },
       {
         "command": "paredit.forceDeleteForward",
@@ -2729,7 +2739,7 @@
     "calva-lib-test": "node ./out/cljs-lib/test/cljs-lib-tests.js",
     "integration-test": "node ./out/extension-test/integration/runTests.js",
     "unit-test": "npx mocha --require ts-node/register 'src/extension-test/unit/**/*-test.ts'",
-    "unit-test-watch": "npx mocha --watch --require ts-node/register 'src/extension-test/unit/**/*-test.ts'",
+    "unit-test-watch": "npx mocha --watch --require ts-node/register --watch-extensions ts --watch-files src 'src/extension-test/unit/**/*-test.ts'",
     "publish": "bb publish.clj",
     "prettier-format": "npx prettier --write './**/*.{ts,js,json}'",
     "prettier-check": "npx prettier --check './**/*.{ts,js,json}'",

src/calva-fmt/src/providers/ontype_formatter.ts

@@ -7,7 +7,7 @@ import { getConfig } from '../../../config';
 import * as util from '../../../utilities';
 
 export class FormatOnTypeEditProvider implements vscode.OnTypeFormattingEditProvider {
-  async provideOnTypeFormattingEdits(
+  provideOnTypeFormattingEdits(
     document: vscode.TextDocument,
     _position: vscode.Position,
     ch: string,
@@ -22,10 +22,11 @@ export class FormatOnTypeEditProvider implements vscode.OnTypeFormattingEditProv
         if (tokenCursor.withinComment()) {
           return undefined;
         }
-        return paredit.backspace(mDoc).then((fulfilled) => {
-          paredit.close(mDoc, ch);
+        void paredit.backspace(mDoc).then((fulfilled) => {
+          void paredit.close(mDoc, ch);
           return undefined;
         });
+        return;
       } else {
         return undefined;
       }

src/cursor-doc/cursor-context.ts

@@ -1,12 +1,12 @@
 import { EditableDocument } from './model';
 
 export const allCursorContexts = [
-  'calva:cursorInString',
-  'calva:cursorInComment',
-  'calva:cursorAtStartOfLine',
-  'calva:cursorAtEndOfLine',
-  'calva:cursorBeforeComment',
-  'calva:cursorAfterComment',
+  // 'calva:cursorInString',
+  // 'calva:cursorInComment',
+  // 'calva:cursorAtStartOfLine',
+  // 'calva:cursorAtEndOfLine',
+  // 'calva:cursorBeforeComment',
+  // 'calva:cursorAfterComment',
 ] as const;
 
 export type CursorContext = typeof allCursorContexts[number];
@@ -15,7 +15,7 @@ export type CursorContext = typeof allCursorContexts[number];
  * Returns true if documentOffset is either at the first char of the token under the cursor, or
  * in the whitespace between the token and the first preceding EOL, otherwise false
  */
-export function isAtLineStartInclWS(doc: EditableDocument, offset = doc.selection.active) {
+export function isAtLineStartInclWS(doc: EditableDocument, offset = doc.selections[0].active) {
   const tokenCursor = doc.getTokenCursor(offset);
   let startOfLine = false;
   //  only at start if we're in ws, or at the 1st char of a non-ws sexp
@@ -33,7 +33,7 @@ export function isAtLineStartInclWS(doc: EditableDocument, offset = doc.selectio
  * Returns true if position is after the last char of the last lisp token on the line, including
  * any trailing whitespace or EOL, otherwise false
  */
-export function isAtLineEndInclWS(doc: EditableDocument, offset = doc.selection.active) {
+export function isAtLineEndInclWS(doc: EditableDocument, offset = doc.selections[0].active) {
   const tokenCursor = doc.getTokenCursor(offset);
   if (tokenCursor.getToken().type === 'eol') {
     return true;
@@ -56,27 +56,29 @@ export function isAtLineEndInclWS(doc: EditableDocument, offset = doc.selection.
   return false;
 }
 
+// TODO: setting the vscode ext context for cursor context might not work for multi-cursor
 export function determineContexts(
   doc: EditableDocument,
-  offset = doc.selection.active
-): CursorContext[] {
+  offset = doc.selections[0].active
+): readonly CursorContext[] {
   const tokenCursor = doc.getTokenCursor(offset);
-  const contexts: CursorContext[] = [];
+  // const contexts: CursorContext[] = [];
+  const contexts: readonly CursorContext[] = allCursorContexts;
 
   if (isAtLineStartInclWS(doc)) {
-    contexts.push('calva:cursorAtStartOfLine');
+    // contexts.push('calva:cursorAtStartOfLine');
   } else if (isAtLineEndInclWS(doc)) {
-    contexts.push('calva:cursorAtEndOfLine');
+    // contexts.push('calva:cursorAtEndOfLine');
   }
 
   if (tokenCursor.withinString()) {
-    contexts.push('calva:cursorInString');
+    // contexts.push('calva:cursorInString');
   } else if (tokenCursor.withinComment()) {
-    contexts.push('calva:cursorInComment');
+    // contexts.push('calva:cursorInComment');
   }
 
   // Compound contexts
-  if (contexts.includes('calva:cursorInComment')) {
+  /*   if (contexts.includes('calva:cursorInComment')) {
     if (contexts.includes('calva:cursorAtEndOfLine')) {
       tokenCursor.forwardWhitespace(false);
       if (tokenCursor.getToken().type != 'comment') {
@@ -88,7 +90,7 @@ export function determineContexts(
         contexts.push('calva:cursorBeforeComment');
       }
     }
-  }
+  } */
 
   return contexts;
 }