Skip to content

Commit 6ee1da3

Browse files
author
Benjamin Pasero
committed
debt - shuffle things around
1 parent 4e4cb81 commit 6ee1da3

21 files changed

Lines changed: 43 additions & 42 deletions

File tree

‎build/lib/i18n.resources.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
"project": "vscode-workbench"
272272
},
273273
{
274-
"name": "vs/workbench/services/workspace",
274+
"name": "vs/workbench/services/workspaces",
275275
"project": "vscode-workbench"
276276
},
277277
{

‎src/vs/platform/workspace/common/workspace.ts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,23 @@ import { IWorkspaceIdentifier, IStoredWorkspaceFolder, isRawFileWorkspaceFolder,
1212

1313
export const IWorkspaceContextService = createDecorator<IWorkspaceContextService>('contextService');
1414

15-
export const enum WorkbenchState {
16-
EMPTY = 1,
17-
FOLDER,
18-
WORKSPACE
19-
}
20-
21-
export interface IWorkspaceFoldersChangeEvent {
22-
added: IWorkspaceFolder[];
23-
removed: IWorkspaceFolder[];
24-
changed: IWorkspaceFolder[];
25-
}
26-
2715
export interface IWorkspaceContextService {
2816
_serviceBrand: undefined;
2917

3018
/**
3119
* An event which fires on workbench state changes.
3220
*/
33-
onDidChangeWorkbenchState: Event<WorkbenchState>;
21+
readonly onDidChangeWorkbenchState: Event<WorkbenchState>;
3422

3523
/**
3624
* An event which fires on workspace name changes.
3725
*/
38-
onDidChangeWorkspaceName: Event<void>;
26+
readonly onDidChangeWorkspaceName: Event<void>;
3927

4028
/**
4129
* An event which fires on workspace folders change.
4230
*/
43-
onDidChangeWorkspaceFolders: Event<IWorkspaceFoldersChangeEvent>;
31+
readonly onDidChangeWorkspaceFolders: Event<IWorkspaceFoldersChangeEvent>;
4432

4533
/**
4634
* Provides access to the complete workspace object.
@@ -79,6 +67,18 @@ export interface IWorkspaceContextService {
7967
isInsideWorkspace(resource: URI): boolean;
8068
}
8169

70+
export const enum WorkbenchState {
71+
EMPTY = 1,
72+
FOLDER,
73+
WORKSPACE
74+
}
75+
76+
export interface IWorkspaceFoldersChangeEvent {
77+
added: IWorkspaceFolder[];
78+
removed: IWorkspaceFolder[];
79+
changed: IWorkspaceFolder[];
80+
}
81+
8282
export namespace IWorkspace {
8383
export function isIWorkspace(thing: any): thing is IWorkspace {
8484
return thing && typeof thing === 'object'
@@ -106,6 +106,7 @@ export interface IWorkspace {
106106
}
107107

108108
export interface IWorkspaceFolderData {
109+
109110
/**
110111
* The associated URI for this workspace folder.
111112
*/
@@ -264,5 +265,6 @@ export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[],
264265
}
265266
}
266267
}
268+
267269
return result;
268270
}

‎src/vs/platform/workspaces/common/workspaces.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,14 @@ export interface IWorkspacesService {
3030

3131
_serviceBrand: undefined;
3232

33-
readonly onRecentlyOpenedChange: CommonEvent<void>;
34-
3533
// Management
3634
enterWorkspace(path: URI): Promise<IEnterWorkspaceResult | undefined>;
3735
createUntitledWorkspace(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier>;
3836
deleteUntitledWorkspace(workspace: IWorkspaceIdentifier): Promise<void>;
3937
getWorkspaceIdentifier(workspacePath: URI): Promise<IWorkspaceIdentifier>;
4038

4139
// History
40+
readonly onRecentlyOpenedChange: CommonEvent<void>;
4241
addRecentlyOpened(recents: IRecent[]): Promise<void>;
4342
removeFromRecentlyOpened(workspaces: URI[]): Promise<void>;
4443
clearRecentlyOpened(): Promise<void>;

‎src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface IWorkspacesHistoryMainService {
3030

3131
_serviceBrand: undefined;
3232

33-
onRecentlyOpenedChange: CommonEvent<void>;
33+
readonly onRecentlyOpenedChange: CommonEvent<void>;
3434

3535
addRecentlyOpened(recents: IRecent[]): void;
3636
getRecentlyOpened(currentWorkspace?: IWorkspaceIdentifier, currentFolder?: ISingleFolderWorkspaceIdentifier, currentFiles?: IPath[]): IRecentlyOpened;

‎src/vs/platform/workspaces/electron-main/workspacesMainService.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,13 @@ import { Disposable } from 'vs/base/common/lifecycle';
2020
import { originalFSPath, isEqualOrParent, joinPath } from 'vs/base/common/resources';
2121
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
2222

23-
export interface IStoredWorkspace {
24-
folders: IStoredWorkspaceFolder[];
25-
remoteAuthority?: string;
26-
}
27-
2823
export const IWorkspacesMainService = createDecorator<IWorkspacesMainService>('workspacesMainService');
2924

3025
export interface IWorkspacesMainService {
3126

3227
_serviceBrand: undefined;
3328

34-
onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier>;
29+
readonly onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier>;
3530

3631
createUntitledWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier;
3732

@@ -50,6 +45,11 @@ export interface IWorkspacesMainService {
5045
getWorkspaceIdentifier(workspacePath: URI): Promise<IWorkspaceIdentifier>;
5146
}
5247

48+
export interface IStoredWorkspace {
49+
folders: IStoredWorkspaceFolder[];
50+
remoteAuthority?: string;
51+
}
52+
5353
export class WorkspacesMainService extends Disposable implements IWorkspacesMainService {
5454

5555
_serviceBrand: undefined;

‎src/vs/workbench/api/browser/mainThreadWorkspace.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IWorkspaceContextService, WorkbenchState, IWorkspace } from 'vs/platfor
1616
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
1717
import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/contrib/search/common/queryBuilder';
1818
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
19-
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
19+
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
2020
import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, MainContext, MainThreadWorkspaceShape, IWorkspaceData, ITextSearchComplete } from '../common/extHost.protocol';
2121
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
2222
import { isEqualOrParent } from 'vs/base/common/resources';

‎src/vs/workbench/browser/actions/workspaceActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Action } from 'vs/base/common/actions';
77
import * as nls from 'vs/nls';
88
import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
99
import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
10-
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
10+
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
1111
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1212
import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
1313
import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';

‎src/vs/workbench/browser/actions/workspaceCommands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as nls from 'vs/nls';
77
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
8-
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
8+
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
99
import * as resources from 'vs/base/common/resources';
1010
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
1111
import { CancellationToken } from 'vs/base/common/cancellation';

‎src/vs/workbench/browser/dnd.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/co
2828
import { Disposable } from 'vs/base/common/lifecycle';
2929
import { addDisposableListener, EventType } from 'vs/base/browser/dom';
3030
import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
31-
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
31+
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
3232
import { withNullAsUndefined } from 'vs/base/common/types';
3333
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
3434
import { IHostService } from 'vs/workbench/services/host/browser/host';

‎src/vs/workbench/contrib/files/browser/fileCommands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
2929
import { isWindows } from 'vs/base/common/platform';
3030
import { ITextModelService } from 'vs/editor/common/services/resolverService';
3131
import { getResourceForCommand, getMultiSelectedResources } from 'vs/workbench/contrib/files/browser/files';
32-
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
32+
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
3333
import { getMultiSelectedEditorContexts } from 'vs/workbench/browser/parts/editor/editorCommands';
3434
import { Schemas } from 'vs/base/common/network';
3535
import { INotificationService } from 'vs/platform/notification/common/notification';

0 commit comments

Comments
 (0)