Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -16,7 +16,7 @@ interface IEditOperation {
export class ReplaceAllCommand implements editorCommon.ICommand {
private readonly _editorSelection: Selection;
private _trackedEditorSelectionId: string;
private _trackedEditorSelectionId: string | null;
private readonly _ranges: Range[];
private readonly _replaceStrings: string[];
@@ -24,6 +24,7 @@ export class ReplaceAllCommand implements editorCommon.ICommand {
this._editorSelection = editorSelection;
this._ranges = ranges;
this._replaceStrings = replaceStrings;
this._trackedEditorSelectionId = null;
}
public getEditOperations(model: ITextModel, builder: editorCommon.IEditOperationBuilder): void {
@@ -66,6 +67,6 @@ export class ReplaceAllCommand implements editorCommon.ICommand {
}
public computeCursorState(model: ITextModel, helper: editorCommon.ICursorStateComputerData): Selection {
return helper.getTrackedSelection(this._trackedEditorSelectionId);
return helper.getTrackedSelection(this._trackedEditorSelectionId!);
}
}