Skip to content

Commit 04139fa

Browse files
sandy081sandy081
committed
Rename to IWorkspaceFolder
1 parent ccc5f96 commit 04139fa

29 files changed

Lines changed: 130 additions & 130 deletions

File tree

‎src/vs/editor/standalone/browser/simpleServices.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingReso
1818
import { IKeybindingEvent, KeybindingSource, IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
1919
import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
2020
import { IConfirmation, IMessageService } from 'vs/platform/message/common/message';
21-
import { IWorkspaceContextService, IWorkspace, WorkbenchState, WorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
21+
import { IWorkspaceContextService, IWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
2222
import * as editorCommon from 'vs/editor/common/editorCommon';
2323
import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
2424
import { Selection } from 'vs/editor/common/core/selection';
@@ -552,15 +552,15 @@ export class SimpleWorkspaceContextService implements IWorkspaceContextService {
552552
return WorkbenchState.EMPTY;
553553
}
554554

555-
public getWorkspaceFolder(resource: URI): WorkspaceFolder {
555+
public getWorkspaceFolder(resource: URI): IWorkspaceFolder {
556556
return resource && resource.scheme === SimpleWorkspaceContextService.SCHEME ? this.workspace.folders[0] : void 0;
557557
}
558558

559559
public isInsideWorkspace(resource: URI): boolean {
560560
return resource && resource.scheme === SimpleWorkspaceContextService.SCHEME;
561561
}
562562

563-
public toResource(workspaceRelativePath: string, workspaceFolder: WorkspaceFolder): URI {
563+
public toResource(workspaceRelativePath: string, workspaceFolder: IWorkspaceFolder): URI {
564564
return URI.file(workspaceRelativePath);
565565
}
566566

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ export enum WorkbenchState {
2222
}
2323

2424
export interface IWorkspaceFoldersChangeEvent {
25-
added: WorkspaceFolder[];
26-
removed: WorkspaceFolder[];
27-
changed: WorkspaceFolder[];
25+
added: IWorkspaceFolder[];
26+
removed: IWorkspaceFolder[];
27+
changed: IWorkspaceFolder[];
2828
}
2929

3030
export interface IWorkspaceContextService {
@@ -64,7 +64,7 @@ export interface IWorkspaceContextService {
6464
* Returns the folder for the given resource from the workspace.
6565
* Can be null if there is no workspace or the resource is not inside the workspace.
6666
*/
67-
getWorkspaceFolder(resource: URI): WorkspaceFolder;
67+
getWorkspaceFolder(resource: URI): IWorkspaceFolder;
6868

6969
/**
7070
* Return `true` if the current workspace has the given identifier otherwise `false`.
@@ -79,7 +79,7 @@ export interface IWorkspaceContextService {
7979
/**
8080
* Given a workspace relative path and workspace folder, returns the resource with the absolute path.
8181
*/
82-
toResource: (workspaceRelativePath: string, workspaceFolder: WorkspaceFolder) => URI;
82+
toResource: (workspaceRelativePath: string, workspaceFolder: IWorkspaceFolder) => URI;
8383
}
8484

8585
export interface IWorkspace {
@@ -97,15 +97,15 @@ export interface IWorkspace {
9797
/**
9898
* Folders in the workspace.
9999
*/
100-
readonly folders: WorkspaceFolder[];
100+
readonly folders: IWorkspaceFolder[];
101101

102102
/**
103103
* the location of the workspace configuration
104104
*/
105105
readonly configuration?: URI;
106106
}
107107

108-
export interface WorkspaceFolder {
108+
export interface IWorkspaceFolder {
109109

110110
/**
111111
* The associated URI for this workspace folder.
@@ -131,13 +131,13 @@ export interface WorkspaceFolder {
131131

132132
export class Workspace implements IWorkspace {
133133

134-
private _foldersMap: TrieMap<WorkspaceFolder> = new TrieMap<WorkspaceFolder>();
135-
private _folders: WorkspaceFolder[];
134+
private _foldersMap: TrieMap<IWorkspaceFolder> = new TrieMap<IWorkspaceFolder>();
135+
private _folders: IWorkspaceFolder[];
136136

137137
constructor(
138138
private _id: string,
139139
private _name: string = '',
140-
folders: WorkspaceFolder[] = [],
140+
folders: IWorkspaceFolder[] = [],
141141
private _configuration: URI = null,
142142
private _ctime?: number
143143
) {
@@ -152,11 +152,11 @@ export class Workspace implements IWorkspace {
152152
this.folders = workspace.folders;
153153
}
154154

155-
public get folders(): WorkspaceFolder[] {
155+
public get folders(): IWorkspaceFolder[] {
156156
return this._folders;
157157
}
158158

159-
public set folders(folders: WorkspaceFolder[]) {
159+
public set folders(folders: IWorkspaceFolder[]) {
160160
this._folders = folders;
161161
this.updateFoldersMap();
162162
}
@@ -185,7 +185,7 @@ export class Workspace implements IWorkspace {
185185
this._configuration = configuration;
186186
}
187187

188-
public getFolder(resource: URI): WorkspaceFolder {
188+
public getFolder(resource: URI): IWorkspaceFolder {
189189
if (!resource) {
190190
return null;
191191
}
@@ -194,7 +194,7 @@ export class Workspace implements IWorkspace {
194194
}
195195

196196
private updateFoldersMap(): void {
197-
this._foldersMap = new TrieMap<WorkspaceFolder>();
197+
this._foldersMap = new TrieMap<IWorkspaceFolder>();
198198
for (const folder of this.folders) {
199199
this._foldersMap.insert(folder.uri.toString(), folder);
200200
}
@@ -205,13 +205,13 @@ export class Workspace implements IWorkspace {
205205
}
206206
}
207207

208-
export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], relativeTo?: URI): WorkspaceFolder[] {
208+
export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], relativeTo?: URI): IWorkspaceFolder[] {
209209
let workspaceFolders = parseWorkspaceFolders(configuredFolders, relativeTo);
210210
return ensureUnique(coalesce(workspaceFolders))
211211
.map(({ uri, raw, name }, index) => ({ uri, raw, name: name || paths.basename(uri.fsPath), index }));
212212
}
213213

214-
function parseWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], relativeTo: URI): WorkspaceFolder[] {
214+
function parseWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], relativeTo: URI): IWorkspaceFolder[] {
215215
return configuredFolders.map((configuredFolder, index) => {
216216
const uri = toUri(configuredFolder.path, relativeTo);
217217
if (!uri) {
@@ -233,6 +233,6 @@ function toUri(path: string, relativeTo: URI): URI {
233233
return null;
234234
}
235235

236-
function ensureUnique(folders: WorkspaceFolder[]): WorkspaceFolder[] {
236+
function ensureUnique(folders: IWorkspaceFolder[]): IWorkspaceFolder[] {
237237
return distinct(folders, folder => isLinux ? folder.uri.fsPath : folder.uri.fsPath.toLowerCase());
238238
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'use strict';
77

88
import * as assert from 'assert';
9-
import { Workspace, WorkspaceFolder, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
9+
import { Workspace, IWorkspaceFolder, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
1010
import URI from 'vs/base/common/uri';
1111

1212
suite('Workspace', () => {
@@ -191,7 +191,7 @@ suite('Workspace', () => {
191191
assert.equal(actual[2].name, 'test1');
192192
});
193193

194-
function aWorkspaceFolder(uri: URI, index: number = 0): WorkspaceFolder {
194+
function aWorkspaceFolder(uri: URI, index: number = 0): IWorkspaceFolder {
195195
return {
196196
uri, raw: { path: uri.fsPath }, index, name: ''
197197
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { isLinux } from 'vs/base/common/platform';
1414
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1515
import Event from 'vs/base/common/event';
1616
import { tildify, getPathLabel } from 'vs/base/common/labels';
17-
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
17+
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
1818

1919
export const IWorkspacesMainService = createDecorator<IWorkspacesMainService>('workspacesMainService');
2020
export const IWorkspacesService = createDecorator<IWorkspacesService>('workspacesService');
@@ -39,7 +39,7 @@ export interface IStoredWorkspaceFolder {
3939
}
4040

4141
export interface IResolvedWorkspace extends IWorkspaceIdentifier {
42-
folders: WorkspaceFolder[];
42+
folders: IWorkspaceFolder[];
4343
}
4444

4545
export interface IWorkspaceSavedEvent {

‎src/vs/workbench/api/node/extHost.protocol.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { ITreeItem } from 'vs/workbench/common/views';
4747
import { ThemeColor } from 'vs/platform/theme/common/themeService';
4848
import { IDisposable } from 'vs/base/common/lifecycle';
4949
import { SerializedError } from 'vs/base/common/errors';
50-
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
50+
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
5151
import { IStat, IFileChange } from 'vs/platform/files/common/files';
5252

5353
export interface IEnvironment {
@@ -65,7 +65,7 @@ export interface IEnvironment {
6565
export interface IWorkspaceData {
6666
id: string;
6767
name: string;
68-
folders: WorkspaceFolder[];
68+
folders: IWorkspaceFolder[];
6969
}
7070

7171
export interface IInitData {

‎src/vs/workbench/parts/debug/common/debug.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ISuggestion } from 'vs/editor/common/modes';
1717
import { Source } from 'vs/workbench/parts/debug/common/debugSource';
1818
import { Range, IRange } from 'vs/editor/common/core/range';
1919
import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
20-
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
20+
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
2121
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
2222

2323
export const VIEWLET_ID = 'workbench.view.debug';
@@ -88,7 +88,7 @@ export interface IExpression extends IReplElement, IExpressionContainer {
8888
}
8989

9090
export interface ISession {
91-
root: WorkspaceFolder;
91+
root: IWorkspaceFolder;
9292
stackTrace(args: DebugProtocol.StackTraceArguments): TPromise<DebugProtocol.StackTraceResponse>;
9393
exceptionInfo(args: DebugProtocol.ExceptionInfoArguments): TPromise<DebugProtocol.ExceptionInfoResponse>;
9494
scopes(args: DebugProtocol.ScopesArguments): TPromise<DebugProtocol.ScopesResponse>;
@@ -422,7 +422,7 @@ export interface ILaunch {
422422
*/
423423
uri: uri;
424424

425-
workspace: WorkspaceFolder;
425+
workspace: IWorkspaceFolder;
426426

427427
/**
428428
* Returns a configuration with the specified name.
@@ -585,12 +585,12 @@ export interface IDebugService {
585585
* Also saves all files, manages if compounds are present in the configuration
586586
* and calls the startSessionCommand if an adapter registered it.
587587
*/
588-
startDebugging(root: WorkspaceFolder, configOrName?: IConfig | string, noDebug?: boolean): TPromise<any>;
588+
startDebugging(root: IWorkspaceFolder, configOrName?: IConfig | string, noDebug?: boolean): TPromise<any>;
589589

590590
/**
591591
* Creates a new debug process. Depending on the configuration will either 'launch' or 'attach'.
592592
*/
593-
createProcess(root: WorkspaceFolder, config: IConfig): TPromise<IProcess>;
593+
createProcess(root: IWorkspaceFolder, config: IConfig): TPromise<IProcess>;
594594

595595
/**
596596
* Find process by ID.

‎src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/plat
2626
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
2727
import { IFileService } from 'vs/platform/files/common/files';
2828
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
29-
import { IWorkspaceContextService, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
29+
import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
3030
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
3131
import { ICommandService } from 'vs/platform/commands/common/commands';
3232
import { IDebugConfigurationProvider, IRawAdapter, ICompound, IDebugConfiguration, DEBUG_SCHEME, IConfig, IEnvConfig, IGlobalConfig, IConfigurationManager, ILaunch } from 'vs/workbench/parts/debug/common/debug';
@@ -473,7 +473,7 @@ class Launch implements ILaunch {
473473

474474
constructor(
475475
private configurationManager: ConfigurationManager,
476-
public workspace: WorkspaceFolder,
476+
public workspace: IWorkspaceFolder,
477477
@IFileService private fileService: IFileService,
478478
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
479479
@IConfigurationService private configurationService: IConfigurationService,

‎src/vs/workbench/parts/debug/electron-browser/debugService.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
4646
import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
4747
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
4848
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
49-
import { IWorkspaceContextService, WorkbenchState, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
49+
import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
5050
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
5151
import { ILogEntry, EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
5252
import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-browser/broadcastService';
@@ -623,7 +623,7 @@ export class DebugService implements debug.IDebugService {
623623
return this.model.evaluateWatchExpressions(this.viewModel.focusedProcess, this.viewModel.focusedStackFrame);
624624
}
625625

626-
public startDebugging(root: WorkspaceFolder, configOrName?: debug.IConfig | string, noDebug = false, topCompoundName?: string): TPromise<any> {
626+
public startDebugging(root: IWorkspaceFolder, configOrName?: debug.IConfig | string, noDebug = false, topCompoundName?: string): TPromise<any> {
627627

628628
// make sure to save all files and that the configuration is up to date
629629
return this.extensionService.activateByEvent('onDebug').then(() => this.textFileService.saveAll().then(() => this.configurationService.reloadConfiguration().then(() =>
@@ -730,7 +730,7 @@ export class DebugService implements debug.IDebugService {
730730
return null;
731731
}
732732

733-
public createProcess(root: WorkspaceFolder, config: debug.IConfig): TPromise<debug.IProcess> {
733+
public createProcess(root: IWorkspaceFolder, config: debug.IConfig): TPromise<debug.IProcess> {
734734
return this.textFileService.saveAll().then(() =>
735735
(this.configurationManager.selectedLaunch ? this.configurationManager.selectedLaunch.resolveConfiguration(config) : TPromise.as(config)).then(resolvedConfig => {
736736
if (!resolvedConfig) {
@@ -800,7 +800,7 @@ export class DebugService implements debug.IDebugService {
800800
);
801801
}
802802

803-
private doCreateProcess(root: WorkspaceFolder, configuration: debug.IConfig, sessionId = generateUuid()): TPromise<debug.IProcess> {
803+
private doCreateProcess(root: IWorkspaceFolder, configuration: debug.IConfig, sessionId = generateUuid()): TPromise<debug.IProcess> {
804804
configuration.__sessionId = sessionId;
805805
this.updateStateAndEmit(sessionId, debug.State.Initializing);
806806
this.inDebugMode.set(true);
@@ -925,7 +925,7 @@ export class DebugService implements debug.IDebugService {
925925
});
926926
}
927927

928-
private runPreLaunchTask(root: WorkspaceFolder, taskName: string): TPromise<ITaskSummary> {
928+
private runPreLaunchTask(root: IWorkspaceFolder, taskName: string): TPromise<ITaskSummary> {
929929
if (!taskName) {
930930
return TPromise.as(null);
931931
}

‎src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import debug = require('vs/workbench/parts/debug/common/debug');
2222
import { Adapter } from 'vs/workbench/parts/debug/node/debugAdapter';
2323
import { V8Protocol } from 'vs/workbench/parts/debug/node/v8Protocol';
2424
import { IOutputService } from 'vs/workbench/parts/output/common/output';
25-
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
25+
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
2626
import { ExtensionsChannelId } from 'vs/platform/extensionManagement/common/extensionManagement';
2727
import { TerminalSupport } from 'vs/workbench/parts/debug/electron-browser/terminalSupport';
2828
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -71,7 +71,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
7171
private debugServerPort: number,
7272
private adapter: Adapter,
7373
private customTelemetryService: ITelemetryService,
74-
public root: WorkspaceFolder,
74+
public root: IWorkspaceFolder,
7575
@IMessageService private messageService: IMessageService,
7676
@ITelemetryService private telemetryService: ITelemetryService,
7777
@IOutputService private outputService: IOutputService,

‎src/vs/workbench/parts/debug/node/debugAdapter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import * as objects from 'vs/base/common/objects';
1414
import * as paths from 'vs/base/common/paths';
1515
import * as platform from 'vs/base/common/platform';
1616
import { IJSONSchema, IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
17-
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
17+
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
1818
import { IConfig, IRawAdapter, IAdapterExecutable, INTERNAL_CONSOLE_OPTIONS_SCHEMA } from 'vs/workbench/parts/debug/common/debug';
1919
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
2020
import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
@@ -35,7 +35,7 @@ export class Adapter {
3535

3636
public hasConfigurationProvider = false;
3737

38-
public getAdapterExecutable(root: WorkspaceFolder, verifyAgainstFS = true): TPromise<IAdapterExecutable> {
38+
public getAdapterExecutable(root: IWorkspaceFolder, verifyAgainstFS = true): TPromise<IAdapterExecutable> {
3939

4040
if (this.rawAdapter.adapterExecutableCommand) {
4141
return this.commandService.executeCommand<IAdapterExecutable>(this.rawAdapter.adapterExecutableCommand, root.uri.toString()).then(ad => {

0 commit comments

Comments
 (0)