prettier format files

Author: riotrah

src/cursor-doc/paredit.ts

@@ -83,7 +83,7 @@ export function selectRight(doc: EditableDocument) {
   const ranges = doc.selections.map((selection) => {
     const rangeFn =
       selection.active >= selection.anchor
-        ? doc => forwardHybridSexpRange(doc, selection.end)
+        ? (doc) => forwardHybridSexpRange(doc, selection.end)
         : (doc: EditableDocument) => forwardHybridSexpRange(doc, selection.active, true);
     return rangeFn(doc);
   });
@@ -335,12 +335,11 @@ export function forwardHybridSexpRange(
   offsets: number | number[] = doc.selections.map((s) => s.end),
   goPastWhitespace = false
 ): [number, number] | Array<[number, number]> {
-
-  if(isNumber(offsets)) {
+  if (isNumber(offsets)) {
     offsets = [offsets];
   }
 
-  const ranges = offsets.map<[number,number]>((offset) => {
+  const ranges = offsets.map<[number, number]>((offset) => {
     // const { end: offset } = selection;
 
     let cursor = doc.getTokenCursor(offset);
@@ -1036,53 +1035,57 @@ export async function deleteForward(
   // _start: number = doc.selections.anchor,
   // _end: number = doc.selections.active
 ) {
-  const results = await Promise.all(doc.selections.map(async (selection, index) => {
-    const { start, end } = selection;
-    if (start != end) {
-      // await doc.delete();
-      // return selection;
-      return ['delete', selection, index] as const;
-    } else {
-      const cursor = doc.getTokenCursor(start);
-      const prevToken = cursor.getPrevToken();
-      const nextToken = cursor.getToken();
-      const p = start;
-      if (doc.model.getText(p, p + 2, true) == '\\"') {
-        const res = await doc.model.edit([new ModelEdit('deleteRange', [p, 2])], {
-          selections: replaceAt(doc.selections, index, new ModelEditSelection(p)),
-        });
-        return [res.success, res.selections[index], index] as const;
-      } else if (prevToken.type === 'open' && nextToken.type === 'close') {
-        const res = await doc.model.edit(
-          [new ModelEdit('deleteRange', [p - prevToken.raw.length, prevToken.raw.length + 1])],
-          {
-            selections: replaceAt(
-              doc.selections,
-              index,
-              new ModelEditSelection(p - prevToken.raw.length)
-            ),
-          }
-        );
-        return [res.success, res.selections[index], index] as const;
+  const results = await Promise.all(
+    doc.selections.map(async (selection, index) => {
+      const { start, end } = selection;
+      if (start != end) {
+        // await doc.delete();
+        // return selection;
+        return ['delete', selection, index] as const;
       } else {
-        if (['open', 'close'].includes(nextToken.type) && docIsBalanced(doc)) {
-          // doc.selections = replaceAt(doc.selections, index, new ModelEditSelection(p + 1));
-          // return new Promise<boolean>((resolve) => resolve(true));
-          return [true, new ModelEditSelection(p + 1), index] as const;
+        const cursor = doc.getTokenCursor(start);
+        const prevToken = cursor.getPrevToken();
+        const nextToken = cursor.getToken();
+        const p = start;
+        if (doc.model.getText(p, p + 2, true) == '\\"') {
+          const res = await doc.model.edit([new ModelEdit('deleteRange', [p, 2])], {
+            selections: replaceAt(doc.selections, index, new ModelEditSelection(p)),
+          });
+          return [res.success, res.selections[index], index] as const;
+        } else if (prevToken.type === 'open' && nextToken.type === 'close') {
+          const res = await doc.model.edit(
+            [new ModelEdit('deleteRange', [p - prevToken.raw.length, prevToken.raw.length + 1])],
+            {
+              selections: replaceAt(
+                doc.selections,
+                index,
+                new ModelEditSelection(p - prevToken.raw.length)
+              ),
+            }
+          );
+          return [res.success, res.selections[index], index] as const;
         } else {
-          // return doc.delete();
-          // return selection;
-          return ['delete', selection, index] as const;
+          if (['open', 'close'].includes(nextToken.type) && docIsBalanced(doc)) {
+            // doc.selections = replaceAt(doc.selections, index, new ModelEditSelection(p + 1));
+            // return new Promise<boolean>((resolve) => resolve(true));
+            return [true, new ModelEditSelection(p + 1), index] as const;
+          } else {
+            // return doc.delete();
+            // return selection;
+            return ['delete', selection, index] as const;
+          }
         }
       }
-    }
-  }));
-  const postCalvaEditSelections = results.filter(r => isBoolean(r[0]))
-  const cursorsNeedingNativeDeletion = results.filter(r => r[0] === "delete");
-  doc.selections = cursorsNeedingNativeDeletion.map(r => r[1])
-  await doc.delete();
-  doc.selections.push(...postCalvaEditSelections.map(s => s[1]))
-  return results.map(r => r[0] === "delete" ? true : r[0]);
+    })
+  );
+  const postCalvaEditSelections = results.filter((r) => isBoolean(r[0]));
+  const cursorsNeedingNativeDeletion = results.filter((r) => r[0] === 'delete');
+  doc.selections = cursorsNeedingNativeDeletion.map((r) => r[1]);
+  await doc.delete()
+  ;
+
+  doc.selections.push(...postCalvaEditSelections.map((s) => s[1]));
+  return results.map((r) => (r[0] === 'delete' ? true : r[0]));
 }
 
 // FIXME: stringQuote() is defined and tested but is never used or referenced?

src/doc-mirror/index.ts

@@ -49,15 +49,19 @@ export class DocumentModel implements EditableModel {
         },
         { undoStopBefore, undoStopAfter: false }
       )
-      .then(async(success) => {
+      .then(async (success) => {
         if (success) {
           if (options.selections) {
             this.document.selections = options.selections;
           }
           if (!options.skipFormat) {
-            return {edits: modelEdits, selections: options.selections, success: await formatter.formatPosition(editor, false, {
-              'format-depth': options.formatDepth ? options.formatDepth : 1,
-            })};
+            return {
+              edits: modelEdits,
+              selections: options.selections,
+              success: await formatter.formatPosition(editor, false, {
+                'format-depth': options.formatDepth ? options.formatDepth : 1,
+              }),
+            };
           }
         }
         return { edits: modelEdits, selections: options.selections, success };

src/extension-test/unit/common/text-notation.ts

@@ -46,9 +46,11 @@ function textNotationToTextAndSelection(content: string): [string, model.ModelEd
     .replace(/\|?[<>]?\|\d?/g, '');
 
   // 3 capt groups: 0 = total cursor, with number, 1 = just the cursor type, no number, 2 = only for directional selection cursors, the > or <, 3 = only if there's a number, the number itself (eg multi cursor)
-  const matches = Array.from(content.matchAll(
-    /(?<cursorType>(?:\|(?<selectionDirection><|>)\|)|(?:\|))(?<cursorNumber>\d)?/g
-  ));
+  const matches = Array.from(
+    content.matchAll(
+      /(?<cursorType>(?:\|(?<selectionDirection><|>)\|)|(?:\|))(?<cursorNumber>\d)?/g
+    )
+  );
 
   // a map of cursor symbols (eg '|>|3' - including the cursor number if >1 ) to an an array of matches (for their positions mostly) in content string where that cursor is
   // for now, we hope that there are at most two positions per symbol

src/extension-test/unit/cursor-doc/token-cursor-test.ts

@@ -781,7 +781,9 @@ describe('Token Cursor', () => {
         'aaa |(comment (ccc •#foo•(#bar •#baz•[:a :b :c]•x•#(a b c))•#baz•yyy•   z z z   •foo•   •   bar))| (ddd eee)'
       );
       const cursor: LispTokenCursor = a.getTokenCursor(a.selections[0].active);
-      expect(cursor.rangeForDefun(a.selections[0].active, false)).toEqual(textAndSelection(b)[1][0]);
+      expect(cursor.rangeForDefun(a.selections[0].active, false)).toEqual(
+        textAndSelection(b)[1][0]
+      );
     });
     it('Finds comment range for empty comment form', () => {
       // Unimportant use case, just documenting how it behaves
@@ -839,7 +841,9 @@ describe('Token Cursor', () => {
         'aaa |(comment (ccc •#foo•(#bar •#baz•[:a :b :c]•x•#(a b c))•#baz•yyy•   z z z   •foo•   •   bar))| (ddd eee)'
       );
       const cursor: LispTokenCursor = a.getTokenCursor(0);
-      expect(cursor.rangeForDefun(a.selections[0].anchor, false)).toEqual(textAndSelection(b)[1][0]);
+      expect(cursor.rangeForDefun(a.selections[0].anchor, false)).toEqual(
+        textAndSelection(b)[1][0]
+      );
     });
     it('Finds closest form inside multiple nested comments', () => {
       const a = docFromTextNotation('aaa (comment (comment [bbb ccc] | ddd))');