Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

One URI is enought..., fixes #31038

Browse Source
This commit is contained in:
Johannes Rieken
2017-07-20 09:44:38 +02:00
parent 17021a2891
commit f5c4b7abd3
6 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.api.impl.ts
View File

@@ -554,7 +554,7 @@ export function createApiFactory(
TextEditorRevealType: extHostTypes.TextEditorRevealType,
TextEditorSelectionChangeKind: extHostTypes.TextEditorSelectionChangeKind,
DecorationRangeBehavior: extHostTypes.DecorationRangeBehavior,
Uri: extHostTypes.Uri,
Uri: <any>URI,
ViewColumn: extHostTypes.ViewColumn,
WorkspaceEdit: extHostTypes.WorkspaceEdit,
ProgressLocation: extHostTypes.ProgressLocation,

25
src/vs/workbench/api/node/extHostTypes.ts
View File

@@ -488,19 +488,12 @@ export class TextEdit {
}
}
export class Uri extends URI {
private constructor() {
super(undefined, undefined, undefined, undefined, undefined);
}
}
export class WorkspaceEdit {
private _values: [Uri, TextEdit[]][] = [];
private _values: [URI, TextEdit[]][] = [];
private _index = new Map<string, number>();
replace(uri: Uri, range: Range, newText: string): void {
replace(uri: URI, range: Range, newText: string): void {
let edit = new TextEdit(range, newText);
let array = this.get(uri);
if (array) {
@@ -510,19 +503,19 @@ export class WorkspaceEdit {
}
}
insert(resource: Uri, position: Position, newText: string): void {
insert(resource: URI, position: Position, newText: string): void {
this.replace(resource, new Range(position, position), newText);
}
delete(resource: Uri, range: Range): void {
delete(resource: URI, range: Range): void {
this.replace(resource, range, '');
}
has(uri: Uri): boolean {
has(uri: URI): boolean {
return this._index.has(uri.toString());
}
set(uri: Uri, edits: TextEdit[]): void {
set(uri: URI, edits: TextEdit[]): void {
const idx = this._index.get(uri.toString());
if (typeof idx === 'undefined') {
let newLen = this._values.push([uri, edits]);
@@ -532,12 +525,12 @@ export class WorkspaceEdit {
}
}
get(uri: Uri): TextEdit[] {
get(uri: URI): TextEdit[] {
let idx = this._index.get(uri.toString());
return typeof idx !== 'undefined' && this._values[idx][1];
}
entries(): [Uri, TextEdit[]][] {
entries(): [URI, TextEdit[]][] {
return this._values;
}
@@ -1302,7 +1295,7 @@ export enum ProgressLocation {
export class TreeItem {
iconPath?: string | Uri | { light: string | Uri; dark: string | Uri };
iconPath?: string | URI | { light: string | URI; dark: string | URI };
command?: vscode.Command;
contextValue?: string;