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

optionally allow to specify selection at which to insert a snippet, #19116

Browse Source
This commit is contained in:
Johannes Rieken
2017-01-25 15:56:02 +01:00
parent bedb191acc
commit a2a077b088
6 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,7 @@ export abstract class MainThreadEditorsShape {
$tryRevealRange(id: string, range: editorCommon.IRange, revealType: TextEditorRevealType): TPromise<any> { throw ni(); }
$trySetSelections(id: string, selections: editorCommon.ISelection[]): TPromise<any> { throw ni(); }
$tryApplyEdits(id: string, modelVersionId: number, edits: editorCommon.ISingleEditOperation[], opts: IApplyEditsOptions): TPromise<boolean> { throw ni(); }
$tryInsertSnippet(id: string, template: string, opts: IUndoStopOptions): TPromise<any> { throw ni(); }
$tryInsertSnippet(id: string, template: string, selections: editorCommon.ISelection[], opts: IUndoStopOptions): TPromise<any> { throw ni(); }
}
export abstract class MainThreadTreeExplorersShape {

13
src/vs/workbench/api/node/extHostEditors.ts
View File

@@ -620,8 +620,17 @@ class ExtHostTextEditor implements vscode.TextEditor {
});
}
insertSnippet(snippet: SnippetString, options: { undoStopBefore: boolean; undoStopAfter: boolean; } = { undoStopBefore: true, undoStopAfter: true }): Thenable<boolean> {
return this._proxy.$tryInsertSnippet(this._id, snippet.value, options);
insertSnippet(snippet: SnippetString, where?: Selection | Selection[], options: { undoStopBefore: boolean; undoStopAfter: boolean; } = { undoStopBefore: true, undoStopAfter: true }): Thenable<boolean> {
if (!where || (Array.isArray(where) && where.length === 0)) {
where = this._selections;
}
const selections = Array.isArray(where)
? where.map(TypeConverters.fromSelection)
: [TypeConverters.fromSelection(where)];
return this._proxy.$tryInsertSnippet(this._id, snippet.value, selections, options);
}
// ---- util

4
src/vs/workbench/api/node/mainThreadEditors.ts
View File

@@ -293,11 +293,11 @@ export class MainThreadEditors extends MainThreadEditorsShape {
return TPromise.as(this._textEditorsMap[id].applyEdits(modelVersionId, edits, opts));
}
$tryInsertSnippet(id: string, template: string, opts: IUndoStopOptions): TPromise<boolean> {
$tryInsertSnippet(id: string, template: string, selections: ISelection[], opts: IUndoStopOptions): TPromise<boolean> {
if (!this._textEditorsMap[id]) {
return TPromise.wrapError('TextEditor disposed');
}
return TPromise.as(this._textEditorsMap[id].insertSnippet(template, opts));
return TPromise.as(this._textEditorsMap[id].insertSnippet(template, selections, opts));
}
$registerTextEditorDecorationType(key: string, options: IDecorationRenderOptions): void {

5
src/vs/workbench/api/node/mainThreadEditorsTracker.ts
View File

@@ -397,19 +397,20 @@ export class MainThreadTextEditor {
return false;
}
insertSnippet(template: string, opts: IUndoStopOptions) {
const snippetController = SnippetController.get(this._codeEditor);
insertSnippet(template: string, selections: EditorCommon.ISelection[], opts: IUndoStopOptions) {
if (!this._codeEditor) {
return false;
}
this._codeEditor.focus();
this._codeEditor.setSelections(selections);
if (opts.undoStopBefore) {
this._codeEditor.pushUndoStop();
}
const snippetController = SnippetController.get(this._codeEditor);
snippetController.insertSnippet(template, 0, 0);
if (opts.undoStopAfter) {