Skip to content

Commit 1bd7864

Browse files
Remove workspaceFolders from app
1 parent afb490b commit 1bd7864

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

extensions/ql-vscode/src/common/app.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ import { AppEventEmitter } from "./events";
44
import { Logger } from "./logging";
55
import { Memento } from "./memento";
66
import { AppCommandManager } from "./commands";
7-
import type {
8-
WorkspaceFolder,
9-
Event,
10-
WorkspaceFoldersChangeEvent,
11-
} from "vscode";
7+
import type { Event, WorkspaceFoldersChangeEvent } from "vscode";
128

139
export interface App {
1410
createEventEmitter<T>(): AppEventEmitter<T>;
@@ -19,7 +15,6 @@ export interface App {
1915
readonly globalStoragePath: string;
2016
readonly workspaceStoragePath?: string;
2117
readonly workspaceState: Memento;
22-
readonly workspaceFolders: readonly WorkspaceFolder[] | undefined;
2318
readonly onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
2419
readonly credentials: Credentials;
2520
readonly commands: AppCommandManager;

extensions/ql-vscode/src/common/vscode/vscode-app.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ export class ExtensionApp implements App {
4040
return this.extensionContext.workspaceState;
4141
}
4242

43-
public get workspaceFolders(): readonly vscode.WorkspaceFolder[] | undefined {
44-
return vscode.workspace.workspaceFolders;
45-
}
46-
4743
public get onDidChangeWorkspaceFolders(): vscode.Event<vscode.WorkspaceFoldersChangeEvent> {
4844
return vscode.workspace.onDidChangeWorkspaceFolders;
4945
}

extensions/ql-vscode/test/__mocks__/appMock.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,14 @@ import { testCredentialsWithStub } from "../factories/authentication";
88
import { Credentials } from "../../src/common/authentication";
99
import { AppCommandManager } from "../../src/common/commands";
1010
import { createMockCommandManager } from "./commandsMock";
11-
import type {
12-
Event,
13-
WorkspaceFolder,
14-
WorkspaceFoldersChangeEvent,
15-
} from "vscode";
11+
import type { Event, WorkspaceFoldersChangeEvent } from "vscode";
1612

1713
export function createMockApp({
1814
extensionPath = "/mock/extension/path",
1915
workspaceStoragePath = "/mock/workspace/storage/path",
2016
globalStoragePath = "/mock/global/storage/path",
2117
createEventEmitter = <T>() => new MockAppEventEmitter<T>(),
2218
workspaceState = createMockMemento(),
23-
workspaceFolders = [],
2419
onDidChangeWorkspaceFolders = jest.fn(),
2520
credentials = testCredentialsWithStub(),
2621
commands = createMockCommandManager(),
@@ -31,7 +26,6 @@ export function createMockApp({
3126
globalStoragePath?: string;
3227
createEventEmitter?: <T>() => AppEventEmitter<T>;
3328
workspaceState?: Memento;
34-
workspaceFolders?: readonly WorkspaceFolder[] | undefined;
3529
onDidChangeWorkspaceFolders?: Event<WorkspaceFoldersChangeEvent>;
3630
credentials?: Credentials;
3731
commands?: AppCommandManager;
@@ -45,7 +39,6 @@ export function createMockApp({
4539
workspaceStoragePath,
4640
globalStoragePath,
4741
workspaceState,
48-
workspaceFolders,
4942
onDidChangeWorkspaceFolders,
5043
createEventEmitter,
5144
credentials,

0 commit comments

Comments
 (0)