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

more console removal, #84283

Browse Source
This commit is contained in:
Johannes Rieken
2019-12-09 15:59:45 +01:00
parent 1f0c87adff
commit c14fd7b590
9 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/vs/workbench/api/common/extHostTextEditor.ts
View File

@@ -14,6 +14,7 @@ import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData
import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
import { EndOfLine, Position, Range, Selection, SnippetString, TextEditorLineNumbersStyle, TextEditorRevealType } from 'vs/workbench/api/common/extHostTypes';
import * as vscode from 'vscode';
import { ILogService } from 'vs/platform/log/common/log';
export class TextEditorDecorationType implements vscode.TextEditorDecorationType {
@@ -137,6 +138,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
private _proxy: MainThreadTextEditorsShape;
private _id: string;
private _logService: ILogService;
private _tabSize!: number;
private _indentSize!: number;
@@ -144,10 +146,11 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
private _cursorStyle!: TextEditorCursorStyle;
private _lineNumbers!: TextEditorLineNumbersStyle;
constructor(proxy: MainThreadTextEditorsShape, id: string, source: IResolvedTextEditorConfiguration) {
constructor(proxy: MainThreadTextEditorsShape, id: string, source: IResolvedTextEditorConfiguration, logService: ILogService) {
this._proxy = proxy;
this._id = id;
this._accept(source);
this._logService = logService;
}
public _accept(source: IResolvedTextEditorConfiguration): void {
@@ -194,7 +197,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
// reflect the new tabSize value immediately
this._tabSize = tabSize;
}
warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError(this._proxy.$trySetOptions(this._id, {
tabSize: tabSize
}));
}
@@ -235,7 +238,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
// reflect the new indentSize value immediately
this._indentSize = indentSize;
}
warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError(this._proxy.$trySetOptions(this._id, {
indentSize: indentSize
}));
}
@@ -261,7 +264,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
// reflect the new insertSpaces value immediately
this._insertSpaces = insertSpaces;
}
warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError(this._proxy.$trySetOptions(this._id, {
insertSpaces: insertSpaces
}));
}
@@ -276,7 +279,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
return;
}
this._cursorStyle = value;
warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError(this._proxy.$trySetOptions(this._id, {
cursorStyle: value
}));
}
@@ -291,7 +294,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
return;
}
this._lineNumbers = value;
warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError(this._proxy.$trySetOptions(this._id, {
lineNumbers: TypeConverters.TextEditorLineNumbersStyle.from(value)
}));
}
@@ -356,15 +359,17 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
}
if (hasUpdate) {
warnOnError(this._proxy.$trySetOptions(this._id, bulkConfigurationUpdate));
this._warnOnError(this._proxy.$trySetOptions(this._id, bulkConfigurationUpdate));
}
}
private _warnOnError(promise: Promise<any>): void {
promise.catch(err => this._logService.warn(err));
}
}
export class ExtHostTextEditor implements vscode.TextEditor {
private readonly _proxy: MainThreadTextEditorsShape;
private readonly _id: string;
private readonly _documentData: ExtHostDocumentData;
private _selections: Selection[];
@@ -374,18 +379,17 @@ export class ExtHostTextEditor implements vscode.TextEditor {
private _disposed: boolean = false;
private _hasDecorationsForKey: { [key: string]: boolean; };
get id(): string { return this._id; }
constructor(
proxy: MainThreadTextEditorsShape, id: string, document: ExtHostDocumentData,
readonly id: string,
private readonly _proxy: MainThreadTextEditorsShape,
private readonly _logService: ILogService,
document: ExtHostDocumentData,
selections: Selection[], options: IResolvedTextEditorConfiguration,
visibleRanges: Range[], viewColumn: vscode.ViewColumn | undefined
) {
this._proxy = proxy;
this._id = id;
this._documentData = document;
this._selections = selections;
this._options = new ExtHostTextEditorOptions(this._proxy, this._id, options);
this._options = new ExtHostTextEditorOptions(this._proxy, this.id, options, _logService);
this._visibleRanges = visibleRanges;
this._viewColumn = viewColumn;
this._hasDecorationsForKey = Object.create(null);
@@ -397,11 +401,11 @@ export class ExtHostTextEditor implements vscode.TextEditor {
}
show(column: vscode.ViewColumn) {
this._proxy.$tryShowEditor(this._id, TypeConverters.ViewColumn.from(column));
this._proxy.$tryShowEditor(this.id, TypeConverters.ViewColumn.from(column));
}
hide() {
this._proxy.$tryHideEditor(this._id);
this._proxy.$tryHideEditor(this.id);
}
// ---- the document
@@ -502,7 +506,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
() => {
if (TypeConverters.isDecorationOptionsArr(ranges)) {
return this._proxy.$trySetDecorations(
this._id,
this.id,
decorationType.key,
TypeConverters.fromRangeOrRangeWithMessage(ranges)
);
@@ -516,7 +520,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
_ranges[4 * i + 3] = range.end.character + 1;
}
return this._proxy.$trySetDecorationsFast(
this._id,
this.id,
decorationType.key,
_ranges
);
@@ -528,7 +532,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
revealRange(range: Range, revealType: vscode.TextEditorRevealType): void {
this._runOnProxy(
() => this._proxy.$tryRevealRange(
this._id,
this.id,
TypeConverters.Range.from(range),
(revealType || TextEditorRevealType.Default)
)
@@ -537,7 +541,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
private _trySetSelection(): Promise<vscode.TextEditor | null | undefined> {
const selection = this._selections.map(TypeConverters.Selection.from);
return this._runOnProxy(() => this._proxy.$trySetSelections(this._id, selection));
return this._runOnProxy(() => this._proxy.$trySetSelections(this.id, selection));
}
_acceptSelections(selections: Selection[]): void {
@@ -603,7 +607,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
};
});
return this._proxy.$tryApplyEdits(this._id, editData.documentVersionId, edits, {
return this._proxy.$tryApplyEdits(this.id, editData.documentVersionId, edits, {
setEndOfLine: typeof editData.setEndOfLine === 'number' ? TypeConverters.EndOfLine.from(editData.setEndOfLine) : undefined,
undoStopBefore: editData.undoStopBefore,
undoStopAfter: editData.undoStopAfter
@@ -637,27 +641,22 @@ export class ExtHostTextEditor implements vscode.TextEditor {
}
}
return this._proxy.$tryInsertSnippet(this._id, snippet.value, ranges, options);
return this._proxy.$tryInsertSnippet(this.id, snippet.value, ranges, options);
}
// ---- util
private _runOnProxy(callback: () => Promise<any>): Promise<ExtHostTextEditor | undefined | null> {
if (this._disposed) {
console.warn('TextEditor is closed/disposed');
this._logService.warn('TextEditor is closed/disposed');
return Promise.resolve(undefined);
}
return callback().then(() => this, err => {
if (!(err instanceof Error && err.name === 'DISPOSED')) {
console.warn(err);
this._logService.warn(err);
}
return null;
});
}
}
function warnOnError(promise: Promise<any>): void {
promise.then(undefined, (err) => {
console.warn(err);
});
}