Skip to content

Commit 9d5e441

Browse files
Sort imports on formatting (#3254)
1 parent 62b234f commit 9d5e441

333 files changed

Lines changed: 604 additions & 608 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.oxfmtrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"$schema": "./node_modules/oxfmt/configuration_schema.json",
33
"sortPackageJson": false,
4+
"sortImports": {
5+
"newlinesBetween": false,
6+
"partitionByNewline": true,
7+
"internalPattern": ["@cursorless/"]
8+
},
9+
410
"ignorePatterns": [
511
"/packages/app-vscode/src/keyboard/grammar/generated/",
612
"/packages/lib-engine/src/customCommandGrammar/generated/",

packages/app-neovim/src/NeovimCommandServerApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import type { NeovimClient } from "neovim/lib/api/client";
12
import type {
23
CommandServerApi,
34
FocusedElementType,
45
InboundSignal,
56
} from "@cursorless/lib-common";
6-
import type { NeovimClient } from "neovim/lib/api/client";
77

88
export class NeovimCommandServerApi implements CommandServerApi {
99
signals: { prePhrase: InboundSignal };

packages/app-neovim/src/extension.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { NeovimClient } from "neovim/lib/api/client";
2+
import type { NvimPlugin } from "neovim/lib/host/NvimPlugin";
13
import {
24
FakeCommandServerApi,
35
FakeIDE,
@@ -6,10 +8,8 @@ import {
68
import { createCursorlessEngine } from "@cursorless/lib-engine";
79
import { EXTENSION_ID, NeovimIDE } from "@cursorless/lib-neovim-common";
810
import { getNeovimRegistry } from "@cursorless/lib-neovim-registry";
9-
import type { NeovimClient } from "neovim/lib/api/client";
10-
import type { NvimPlugin } from "neovim/lib/host/NvimPlugin";
11-
import { NeovimCommandServerApi } from "./NeovimCommandServerApi";
1211
import { constructTestHelpers } from "./constructTestHelpers";
12+
import { NeovimCommandServerApi } from "./NeovimCommandServerApi";
1313
import { registerCommands } from "./registerCommands";
1414

1515
/**

packages/app-neovim/src/registerCommands.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { NeovimClient } from "neovim";
12
import type {
23
CommandResponse,
34
CommandServerApi,
@@ -8,15 +9,13 @@ import {
89
clientSupportsFallback,
910
ensureCommandShape,
1011
} from "@cursorless/lib-common";
11-
1212
import type { CommandApi } from "@cursorless/lib-engine";
1313
import type { NeovimIDE } from "@cursorless/lib-neovim-common";
1414
import {
1515
modeSwitchNormalTerminal,
1616
modeSwitchTerminal,
1717
} from "@cursorless/lib-neovim-common";
1818
import { getNeovimRegistry } from "@cursorless/lib-neovim-registry";
19-
import type { NeovimClient } from "neovim";
2019

2120
export async function registerCommands(
2221
client: NeovimClient,

packages/app-talonjs/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import * as talon from "talon";
12
import type { RunMode } from "@cursorless/lib-common";
23
import { activate as activateCore } from "@cursorless/lib-talonjs-core";
3-
import * as talon from "talon";
44

55
export async function activate(runMode: RunMode): Promise<void> {
66
await activateCore(talon, runMode);

packages/app-vscode/src/InstallationDependencies.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { isWindows } from "@cursorless/lib-node-common";
2-
import { COMMAND_SERVER_EXTENSION_ID } from "@cursorless/lib-vscode-common";
3-
import glob from "fast-glob";
41
import * as fs from "node:fs";
52
import * as os from "node:os";
63
import * as path from "node:path";
4+
import glob from "fast-glob";
75
import * as vscode from "vscode";
6+
import { isWindows } from "@cursorless/lib-node-common";
7+
import { COMMAND_SERVER_EXTENSION_ID } from "@cursorless/lib-vscode-common";
88

99
const STATE_KEY = "dontShowInstallationDependencies";
1010

packages/app-vscode/src/ReleaseNotes.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as sinon from "sinon";
2+
import type { ExtensionContext, Uri } from "vscode";
23
import type { MessageType, Messages } from "@cursorless/lib-common";
34
import { asyncSafety } from "@cursorless/lib-common";
4-
import type { ExtensionContext, Uri } from "vscode";
5-
import { ReleaseNotes, VERSION_KEY, WHATS_NEW } from "./ReleaseNotes";
65
import type { VscodeApi } from "@cursorless/lib-vscode-common";
6+
import { ReleaseNotes, VERSION_KEY, WHATS_NEW } from "./ReleaseNotes";
77

88
interface Input {
99
/** Whether the VSCode window is focused */

packages/app-vscode/src/ReleaseNotes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import * as semver from "semver";
12
import type { ExtensionContext } from "vscode";
3+
import { URI } from "vscode-uri";
24
import type { Messages } from "@cursorless/lib-common";
35
import { showInfo } from "@cursorless/lib-common";
4-
import * as semver from "semver";
56
import type { VscodeApi } from "@cursorless/lib-vscode-common";
6-
import { URI } from "vscode-uri";
77

88
/**
99
* The key to use in global storage to detect when Cursorless version number has

packages/app-vscode/src/ScopeTreeProvider.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
import type {
2-
CursorlessCommandId,
3-
IDE,
4-
ScopeProvider,
5-
ScopeSupportInfo,
6-
ScopeType,
7-
ScopeTypeInfo,
8-
Selection,
9-
TextEditor,
10-
} from "@cursorless/lib-common";
11-
import {
12-
CURSORLESS_SCOPE_TREE_VIEW_ID,
13-
DOCS_URL,
14-
ScopeSupport,
15-
disposableFrom,
16-
serializeScopeType,
17-
uriEncodeHashId,
18-
} from "@cursorless/lib-common";
19-
import { type CustomSpokenFormGenerator } from "@cursorless/lib-engine";
20-
import { type VscodeApi } from "@cursorless/lib-vscode-common";
211
import { isEqual } from "lodash-es";
222
import type {
233
Disposable,
@@ -38,6 +18,26 @@ import {
3818
window,
3919
} from "vscode";
4020
import { URI } from "vscode-uri";
21+
import type {
22+
CursorlessCommandId,
23+
IDE,
24+
ScopeProvider,
25+
ScopeSupportInfo,
26+
ScopeType,
27+
ScopeTypeInfo,
28+
Selection,
29+
TextEditor,
30+
} from "@cursorless/lib-common";
31+
import {
32+
CURSORLESS_SCOPE_TREE_VIEW_ID,
33+
DOCS_URL,
34+
ScopeSupport,
35+
disposableFrom,
36+
serializeScopeType,
37+
uriEncodeHashId,
38+
} from "@cursorless/lib-common";
39+
import { type CustomSpokenFormGenerator } from "@cursorless/lib-engine";
40+
import { type VscodeApi } from "@cursorless/lib-vscode-common";
4141
import type {
4242
ScopeVisualizer,
4343
VisualizationType,

packages/app-vscode/src/SpyWebviewView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { Disposable } from "@cursorless/lib-common";
21
import { cloneDeep } from "lodash-es";
32
import type { Uri, Webview, WebviewView } from "vscode";
3+
import type { Disposable } from "@cursorless/lib-common";
44
import type { SpyWebViewEvent } from "@cursorless/lib-vscode-common";
55

66
/**

0 commit comments

Comments
 (0)