💄

jrieken · jrieken · commit 1f98bd6a6be6 · 2020-04-27T14:52:15.000+02:00
diff --git a/src/vs/editor/browser/core/editorState.ts b/src/vs/editor/browser/core/editorState.ts
@@ -93,19 +93,19 @@ export class EditorStateCancellationTokenSource extends EditorKeybindingCancella
 
 	private readonly _listener = new DisposableStore();
 
-	constructor(readonly editor: IActiveCodeEditor, flags: CodeEditorStateFlag, parent?: CancellationToken, readonly range?: IRange) {
+	constructor(readonly editor: IActiveCodeEditor, flags: CodeEditorStateFlag, range?: IRange, parent?: CancellationToken) {
 		super(editor, parent);
 
 		if (flags & CodeEditorStateFlag.Position) {
 			this._listener.add(editor.onDidChangeCursorPosition(e => {
-				if (!this.range || !Range.containsPosition(this.range, e.position)) {
+				if (!range || !Range.containsPosition(range, e.position)) {
 					this.cancel();
 				}
 			}));
 		}
 		if (flags & CodeEditorStateFlag.Selection) {
 			this._listener.add(editor.onDidChangeCursorSelection(e => {
-				if (!this.range || !Range.containsRange(this.range, e.selection)) {
+				if (!range || !Range.containsRange(range, e.selection)) {
 					this.cancel();
 				}
 			}));
diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
@@ -150,7 +150,7 @@ export async function formatDocumentRangeWithProvider(
 	let cts: CancellationTokenSource;
 	if (isCodeEditor(editorOrModel)) {
 		model = editorOrModel.getModel();
-		cts = new EditorStateCancellationTokenSource(editorOrModel, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position, token);
+		cts = new EditorStateCancellationTokenSource(editorOrModel, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position, undefined, token);
 	} else {
 		model = editorOrModel;
 		cts = new TextModelCancellationTokenSource(editorOrModel, token);
@@ -238,7 +238,7 @@ export async function formatDocumentWithProvider(
 	let cts: CancellationTokenSource;
 	if (isCodeEditor(editorOrModel)) {
 		model = editorOrModel.getModel();
-		cts = new EditorStateCancellationTokenSource(editorOrModel, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position, token);
+		cts = new EditorStateCancellationTokenSource(editorOrModel, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position, undefined, token);
 	} else {
 		model = editorOrModel;
 		cts = new TextModelCancellationTokenSource(editorOrModel, token);
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
@@ -169,7 +169,7 @@ class RenameController implements IEditorContribution {
 			return undefined;
 		}
 		this._cts.dispose();
-		this._cts = new EditorStateCancellationTokenSource(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value, undefined, loc.range);
+		this._cts = new EditorStateCancellationTokenSource(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value, loc.range);
 
 		// do rename at location
 		let selection = this.editor.getSelection();

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ class RenameController implements IEditorContribution {`
`169`	`169`	`return undefined;`
`170`	`170`	`}`
`171`	`171`	`this._cts.dispose();`
`172`		`- this._cts = new EditorStateCancellationTokenSource(this.editor, CodeEditorStateFlag.Position \| CodeEditorStateFlag.Value, undefined, loc.range);`
	`172`	`+ this._cts = new EditorStateCancellationTokenSource(this.editor, CodeEditorStateFlag.Position \| CodeEditorStateFlag.Value, loc.range);`
`173`	`173`
`174`	`174`	`// do rename at location`
`175`	`175`	`let selection = this.editor.getSelection();`