From 7a2a03f93e9d67ddb79756ff4e98e19641ce67c2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 02:41:38 +0000 Subject: [PATCH 1/4] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-prettier: v2.7.1 → v3.0.0-alpha.6](https://github.com/pre-commit/mirrors-prettier/compare/v2.7.1...v3.0.0-alpha.6) - https://github.com/ikamensh/flynt/: 0.77 → 0.78 - [github.com/wenkokke/talonfmt: 1.9.0 → 1.9.5](https://github.com/wenkokke/talonfmt/compare/1.9.0...1.9.5) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 755e55ad96..ea49411290 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,11 +35,11 @@ repos: # packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$ - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v2.7.1" + rev: "v3.0.0-alpha.6" hooks: - id: prettier - repo: https://github.com/ikamensh/flynt/ - rev: "0.77" + rev: "0.78" hooks: - id: flynt - repo: https://github.com/Zac-HD/shed @@ -50,7 +50,7 @@ repos: args: [--refactor, --py39-plus] types_or: [python, markdown, rst] - repo: https://github.com/wenkokke/talonfmt - rev: 1.9.0 + rev: 1.9.5 hooks: - id: talonfmt args: ["--in-place"] From 66b488f7dc6391990b06be5f1c48468fb97386d6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 02:42:03 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- packages/cheatsheet-local/src/index.html | 2 +- .../src/types/command/legacy/CommandV0V1.types.ts | 4 ++-- .../legacy/PartialTargetDescriptorV3.types.ts | 4 ++-- .../command/legacy/targetDescriptorV2.types.ts | 4 ++-- .../canonicalizeAndValidateCommand.ts | 13 +++++++------ .../cursorless-engine/src/languages/constants.ts | 4 ++-- .../cursorless-engine/src/languages/markdown.ts | 2 +- .../src/ide/vscode/VscodeFocusEditor.ts | 7 +++++-- .../src/ide/vscode/hatStyles.types.ts | 6 +++--- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/packages/cheatsheet-local/src/index.html b/packages/cheatsheet-local/src/index.html index 146b5afc96..6f2ffb43bb 100644 --- a/packages/cheatsheet-local/src/index.html +++ b/packages/cheatsheet-local/src/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/common/src/types/command/legacy/CommandV0V1.types.ts b/packages/common/src/types/command/legacy/CommandV0V1.types.ts index fd7cb35cdf..b4ad471597 100644 --- a/packages/common/src/types/command/legacy/CommandV0V1.types.ts +++ b/packages/common/src/types/command/legacy/CommandV0V1.types.ts @@ -136,8 +136,8 @@ const HAT_NON_DEFAULT_SHAPES = [ "crosshairs", ] as const; -type HatColor = typeof HAT_COLORS[number]; -type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; +type HatColor = (typeof HAT_COLORS)[number]; +type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; type LineNumberType = "absolute" | "relative" | "modulo100"; diff --git a/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts b/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts index 84fd2cec15..24bc46e0a6 100644 --- a/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts +++ b/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts @@ -22,8 +22,8 @@ const HAT_NON_DEFAULT_SHAPES = [ "crosshairs", ] as const; -type HatColor = typeof HAT_COLORS[number]; -type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; +type HatColor = (typeof HAT_COLORS)[number]; +type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; interface CursorMark { diff --git a/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts b/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts index df9692a960..cde4233c4b 100644 --- a/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts +++ b/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts @@ -22,8 +22,8 @@ const HAT_NON_DEFAULT_SHAPES = [ "crosshairs", ] as const; -type HatColor = typeof HAT_COLORS[number]; -type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; +type HatColor = (typeof HAT_COLORS)[number]; +type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; interface CursorMark { diff --git a/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts index 8232ad1fa2..e37ce84f2b 100644 --- a/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts +++ b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts @@ -111,12 +111,13 @@ 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/constants.ts b/packages/cursorless-engine/src/languages/constants.ts index d19faa0c5c..167fe63c80 100644 --- a/packages/cursorless-engine/src/languages/constants.ts +++ b/packages/cursorless-engine/src/languages/constants.ts @@ -33,5 +33,5 @@ export const otherLanguageIds = ["shellscript"] as const; export const allLanguageIds = [...supportedLanguageIds, ...otherLanguageIds]; -export type SupportedLanguageId = typeof supportedLanguageIds[number]; -export type LanguageId = typeof allLanguageIds[number]; +export type SupportedLanguageId = (typeof supportedLanguageIds)[number]; +export type LanguageId = (typeof allLanguageIds)[number]; diff --git a/packages/cursorless-engine/src/languages/markdown.ts b/packages/cursorless-engine/src/languages/markdown.ts index 5913f9d330..c8958b3228 100644 --- a/packages/cursorless-engine/src/languages/markdown.ts +++ b/packages/cursorless-engine/src/languages/markdown.ts @@ -51,7 +51,7 @@ const HEADING_MARKER_TYPES = [ "atx_h5_marker", "atx_h6_marker", ] as const; -type HeadingMarkerType = typeof HEADING_MARKER_TYPES[number]; +type HeadingMarkerType = (typeof HEADING_MARKER_TYPES)[number]; /** * Returns a node finder that will only accept nodes of heading level at least diff --git a/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts index 8ace81a268..e336a0fbde 100644 --- a/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts +++ b/packages/cursorless-vscode-core/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/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts b/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts index 376aa673c7..fcc81bc8a3 100644 --- a/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts +++ b/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts @@ -24,7 +24,7 @@ export const HAT_NON_DEFAULT_SHAPES = [ export const HAT_SHAPES = ["default", ...HAT_NON_DEFAULT_SHAPES] as const; -export type HatColor = typeof HAT_COLORS[number]; -export type HatShape = typeof HAT_SHAPES[number]; -export type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; +export type HatColor = (typeof HAT_COLORS)[number]; +export type HatShape = (typeof HAT_SHAPES)[number]; +export type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; export type VscodeHatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; From 0d8fbf00d3fb551e84fd90eb5f621069929cedf5 Mon Sep 17 00:00:00 2001 From: Pokey Rule <755842+pokey@users.noreply.github.com> Date: Wed, 29 Mar 2023 21:49:31 +0100 Subject: [PATCH 3/4] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea49411290..4298e07d17 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$ - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.6" + rev: "v2.7.1" hooks: - id: prettier - repo: https://github.com/ikamensh/flynt/ From 9bfc1990afc5d8897d1df260fc236a01b7aebc74 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 20:49:56 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- packages/cheatsheet-local/src/index.html | 2 +- .../src/types/command/legacy/CommandV0V1.types.ts | 4 ++-- .../legacy/PartialTargetDescriptorV3.types.ts | 4 ++-- .../command/legacy/targetDescriptorV2.types.ts | 4 ++-- .../canonicalizeAndValidateCommand.ts | 13 ++++++------- .../cursorless-engine/src/languages/constants.ts | 4 ++-- .../cursorless-engine/src/languages/markdown.ts | 2 +- .../src/ide/vscode/VscodeFocusEditor.ts | 7 ++----- .../src/ide/vscode/hatStyles.types.ts | 6 +++--- 9 files changed, 21 insertions(+), 25 deletions(-) diff --git a/packages/cheatsheet-local/src/index.html b/packages/cheatsheet-local/src/index.html index 6f2ffb43bb..146b5afc96 100644 --- a/packages/cheatsheet-local/src/index.html +++ b/packages/cheatsheet-local/src/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/common/src/types/command/legacy/CommandV0V1.types.ts b/packages/common/src/types/command/legacy/CommandV0V1.types.ts index b4ad471597..fd7cb35cdf 100644 --- a/packages/common/src/types/command/legacy/CommandV0V1.types.ts +++ b/packages/common/src/types/command/legacy/CommandV0V1.types.ts @@ -136,8 +136,8 @@ const HAT_NON_DEFAULT_SHAPES = [ "crosshairs", ] as const; -type HatColor = (typeof HAT_COLORS)[number]; -type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; +type HatColor = typeof HAT_COLORS[number]; +type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; type LineNumberType = "absolute" | "relative" | "modulo100"; diff --git a/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts b/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts index 24bc46e0a6..84fd2cec15 100644 --- a/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts +++ b/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts @@ -22,8 +22,8 @@ const HAT_NON_DEFAULT_SHAPES = [ "crosshairs", ] as const; -type HatColor = (typeof HAT_COLORS)[number]; -type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; +type HatColor = typeof HAT_COLORS[number]; +type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; interface CursorMark { diff --git a/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts b/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts index cde4233c4b..df9692a960 100644 --- a/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts +++ b/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts @@ -22,8 +22,8 @@ const HAT_NON_DEFAULT_SHAPES = [ "crosshairs", ] as const; -type HatColor = (typeof HAT_COLORS)[number]; -type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; +type HatColor = typeof HAT_COLORS[number]; +type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`; interface CursorMark { diff --git a/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts index e37ce84f2b..8232ad1fa2 100644 --- a/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts +++ b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts @@ -111,13 +111,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/constants.ts b/packages/cursorless-engine/src/languages/constants.ts index 167fe63c80..d19faa0c5c 100644 --- a/packages/cursorless-engine/src/languages/constants.ts +++ b/packages/cursorless-engine/src/languages/constants.ts @@ -33,5 +33,5 @@ export const otherLanguageIds = ["shellscript"] as const; export const allLanguageIds = [...supportedLanguageIds, ...otherLanguageIds]; -export type SupportedLanguageId = (typeof supportedLanguageIds)[number]; -export type LanguageId = (typeof allLanguageIds)[number]; +export type SupportedLanguageId = typeof supportedLanguageIds[number]; +export type LanguageId = typeof allLanguageIds[number]; diff --git a/packages/cursorless-engine/src/languages/markdown.ts b/packages/cursorless-engine/src/languages/markdown.ts index c8958b3228..5913f9d330 100644 --- a/packages/cursorless-engine/src/languages/markdown.ts +++ b/packages/cursorless-engine/src/languages/markdown.ts @@ -51,7 +51,7 @@ const HEADING_MARKER_TYPES = [ "atx_h5_marker", "atx_h6_marker", ] as const; -type HeadingMarkerType = (typeof HEADING_MARKER_TYPES)[number]; +type HeadingMarkerType = typeof HEADING_MARKER_TYPES[number]; /** * Returns a node finder that will only accept nodes of heading level at least diff --git a/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts index e336a0fbde..8ace81a268 100644 --- a/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts +++ b/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts @@ -59,11 +59,8 @@ 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/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts b/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts index fcc81bc8a3..376aa673c7 100644 --- a/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts +++ b/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts @@ -24,7 +24,7 @@ export const HAT_NON_DEFAULT_SHAPES = [ export const HAT_SHAPES = ["default", ...HAT_NON_DEFAULT_SHAPES] as const; -export type HatColor = (typeof HAT_COLORS)[number]; -export type HatShape = (typeof HAT_SHAPES)[number]; -export type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number]; +export type HatColor = typeof HAT_COLORS[number]; +export type HatShape = typeof HAT_SHAPES[number]; +export type HatNonDefaultShape = typeof HAT_NON_DEFAULT_SHAPES[number]; export type VscodeHatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`;