Update to prettier 3.0.0 (#1697)

auscompgeek · pre-commit-ci-lite[bot] · web-flow · commit bd965dec4414 · 2023-07-30T18:52:59.000Z
https://prettier.io/blog/2023/07/05/3.0.0.html ## Checklist - [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [ ] I have not broken the cheatsheet --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "eslint-import-resolver-typescript": "3.5.5",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "prettier": "2.8.7",
+    "prettier": "3.0.0",
     "syncpack": "9.8.4",
     "tsx": "3.12.3",
     "typescript": "^5.0.3"
diff --git a/packages/cheatsheet-local/src/index.html b/packages/cheatsheet-local/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/packages/cursorless-engine/src/actions/BringMoveSwap.ts b/packages/cursorless-engine/src/actions/BringMoveSwap.ts
@@ -46,7 +46,10 @@ abstract class BringMoveSwap {
     getSourceRangeCallback: (target: Target) => Range;
   };
 
-  constructor(private rangeUpdater: RangeUpdater, private type: ActionType) {}
+  constructor(
+    private rangeUpdater: RangeUpdater,
+    private type: ActionType,
+  ) {}
 
   protected async decorateTargets(sources: Target[], destinations: Target[]) {
     await Promise.all([
diff --git a/packages/cursorless-engine/src/actions/EditNew/EditNew.ts b/packages/cursorless-engine/src/actions/EditNew/EditNew.ts
@@ -11,7 +11,10 @@ import { runInsertLineAfterTargets } from "./runInsertLineAfterTargets";
 import { runEditNewNotebookCellTargets } from "./runNotebookCellTargets";
 
 export class EditNew {
-  constructor(private rangeUpdater: RangeUpdater, private actions: Actions) {
+  constructor(
+    private rangeUpdater: RangeUpdater,
+    private actions: Actions,
+  ) {
     this.run = this.run.bind(this);
   }
 
diff --git a/packages/cursorless-engine/src/actions/PasteFromClipboard.ts b/packages/cursorless-engine/src/actions/PasteFromClipboard.ts
@@ -16,7 +16,10 @@ import { Actions } from "./Actions";
 import { ActionReturnValue } from "./actions.types";
 
 export class PasteFromClipboard {
-  constructor(private rangeUpdater: RangeUpdater, private actions: Actions) {}
+  constructor(
+    private rangeUpdater: RangeUpdater,
+    private actions: Actions,
+  ) {}
 
   async run(destinations: Destination[]): Promise<ActionReturnValue> {
     const editor = ide().getEditableTextEditor(
diff --git a/packages/cursorless-engine/src/core/HatAllocator.ts b/packages/cursorless-engine/src/core/HatAllocator.ts
@@ -13,7 +13,10 @@ export class HatAllocator {
   private disposables: Disposable[] = [];
   private debouncer = new Debouncer(() => this.allocateHats());
 
-  constructor(private hats: Hats, private context: Context) {
+  constructor(
+    private hats: Hats,
+    private context: Context,
+  ) {
     ide().disposeOnExit(this);
 
     this.disposables.push(
diff --git a/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts
@@ -104,11 +104,12 @@ function usesScopeType(
   scopeTypeType: SimpleScopeTypeType,
   partialTargets: PartialTargetDescriptor[],
 ) {
-  return getPartialPrimitiveTargets(partialTargets).some((partialTarget) =>
-    partialTarget.modifiers?.find(
-      (mod: Modifier) =>
-        (mod.type === "containingScope" || mod.type === "everyScope") &&
-        mod.scopeType.type === scopeTypeType,
-    ),
+  return getPartialPrimitiveTargets(partialTargets).some(
+    (partialTarget) =>
+      partialTarget.modifiers?.find(
+        (mod: Modifier) =>
+          (mod.type === "containingScope" || mod.type === "everyScope") &&
+          mod.scopeType.type === scopeTypeType,
+      ),
   );
 }
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/checkCaptureStartEnd.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/checkCaptureStartEnd.ts
@@ -28,9 +28,8 @@ export function checkCaptureStartEnd(
   let shownError = false;
 
   if (captures.length === 2) {
-    const startRange = captures.find(({ name }) =>
-      name.endsWith(".start"),
-    )?.range;
+    const startRange = captures.find(({ name }) => name.endsWith(".start"))
+      ?.range;
     const endRange = captures.find(({ name }) => name.endsWith(".end"))?.range;
     if (startRange != null && endRange != null) {
       if (startRange.end.isBeforeOrEqual(endRange.start)) {
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterScopeHandler.ts
@@ -16,7 +16,10 @@ import { findCaptureByName, getRelatedRange } from "./captureUtils";
 export class TreeSitterScopeHandler extends BaseTreeSitterScopeHandler {
   protected isHierarchical = true;
 
-  constructor(query: TreeSitterQuery, public scopeType: SimpleScopeType) {
+  constructor(
+    query: TreeSitterQuery,
+    public scopeType: SimpleScopeType,
+  ) {
     super(query);
   }
 
diff --git a/packages/cursorless-org/src/styles/globals.css b/packages/cursorless-org/src/styles/globals.css
@@ -14,7 +14,8 @@
   font-style: normal;
   font-weight: 300;
   font-stretch: 1% 500%; /* Required by Chrome */
-  src: local(""),
+  src:
+    local(""),
     /* Modern Browsers */ url("/fonts/Inconsolata_SemiExpanded-Light.ttf")
       format("truetype");
 }
@@ -24,7 +25,8 @@
   font-style: normal;
   font-weight: 400;
   font-stretch: 1% 500%; /* Required by Chrome */
-  src: local(""),
+  src:
+    local(""),
     /* Modern Browsers */ url("/fonts/Inconsolata_SemiExpanded-Regular.ttf")
       format("truetype");
 }
@@ -34,7 +36,8 @@
   font-style: normal;
   font-weight: 500;
   font-stretch: 1% 500%; /* Required by Chrome */
-  src: local(""),
+  src:
+    local(""),
     /* Modern Browsers */ url("/fonts/Inconsolata_SemiExpanded-Medium.ttf")
       format("truetype");
 }
@@ -44,7 +47,8 @@
   font-style: normal;
   font-weight: 600;
   font-stretch: 1% 500%; /* Required by Chrome */
-  src: local(""),
+  src:
+    local(""),
     /* Modern Browsers */ url("/fonts/Inconsolata_SemiExpanded-SemiBold.ttf")
       format("truetype");
 }
@@ -54,7 +58,8 @@
   font-style: normal;
   font-weight: 700;
   font-stretch: 1% 500%; /* Required by Chrome */
-  src: local(""),
+  src:
+    local(""),
     /* Modern Browsers */ url("/fonts/Inconsolata_SemiExpanded-Bold.ttf")
       format("truetype");
 }
@@ -64,7 +69,8 @@
   font-style: normal;
   font-weight: 800;
   font-stretch: 1% 500%; /* Required by Chrome */
-  src: local(""),
+  src:
+    local(""),
     /* Modern Browsers */ url("/fonts/Inconsolata_SemiExpanded-ExtraBold.ttf")
       format("truetype");
 }
diff --git a/packages/cursorless-vscode/src/ide/vscode/VscodeFlashHandler.ts b/packages/cursorless-vscode/src/ide/vscode/VscodeFlashHandler.ts
@@ -10,7 +10,10 @@ import VscodeHighlights from "./VscodeHighlights";
 import { VscodeIDE } from "./VscodeIDE";
 
 export default class VscodeFlashHandler {
-  constructor(private ide: VscodeIDE, private highlights: VscodeHighlights) {}
+  constructor(
+    private ide: VscodeIDE,
+    private highlights: VscodeHighlights,
+  ) {}
 
   async flashRanges(flashDescriptors: FlashDescriptor[]): Promise<void> {
     const flashMap = groupBy(flashDescriptors, ({ style }) => style);
diff --git a/packages/cursorless-vscode/src/ide/vscode/VscodeFocusEditor.ts b/packages/cursorless-vscode/src/ide/vscode/VscodeFocusEditor.ts
@@ -59,8 +59,11 @@ function getViewColumn(editor: TextEditor): ViewColumn | undefined {
     return undefined;
   }
   const uri = editor.document.uri.toString();
-  const tabGroup = (window as any)?.tabGroups?.all?.find((tabGroup: any) =>
-    tabGroup?.tabs.find((tab: any) => tab?.input?.modified?.toString() === uri),
+  const tabGroup = (window as any)?.tabGroups?.all?.find(
+    (tabGroup: any) =>
+      tabGroup?.tabs.find(
+        (tab: any) => tab?.input?.modified?.toString() === uri,
+      ),
   );
   return tabGroup?.viewColumn;
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!doctype html>`
`2`	`2`	`<html lang="en">`
`3`	`3`	`<head>`
`4`	`4`	`<meta charset="utf-8" />`