Fix microsoft#30181. If the tokenization has not be executed for lines above pasted area, we do not force tokenization info as we do not wait for the tokenization to complete.

rebornix · rebornix · commit e97e8ec64bfb · 2017-08-14T15:51:42.000-07:00
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -819,6 +819,11 @@ export interface ITokenizedModel extends ITextModel {
 	 */
 	forceTokenization(lineNumber: number): void;
 
+	/**
+	 * Get the line number of the first line whose tokens might be inaccurate.
+	 * @internal
+	 */
+	getFirstInvalidLineNumber(): number;
 	/**
 	 * Get the tokens for the line `lineNumber`.
 	 * The tokens might be inaccurate. Use `forceTokenization` to ensure accurate tokens.
diff --git a/src/vs/editor/common/model/textModelWithTokens.ts b/src/vs/editor/common/model/textModelWithTokens.ts
@@ -169,6 +169,10 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		return result;
 	}
 
+	public getFirstInvalidLineNumber(): number {
+		return this._invalidLineStartIndex + 1;
+	}
+
 	public forceTokenization(lineNumber: number): void {
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
 			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts
@@ -423,6 +423,9 @@ export class AutoIndentOnPaste implements IEditorContribution {
 		}
 
 		const model = this.editor.getModel();
+		if (model.getFirstInvalidLineNumber() < range.getStartPosition().lineNumber) {
+			return;
+		}
 		const { tabSize, insertSpaces } = model.getOptions();
 		this.editor.pushUndoStop();
 		let textEdits: TextEdit[] = [];

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,9 @@ export class AutoIndentOnPaste implements IEditorContribution {`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`const model = this.editor.getModel();`
	`426`	`+ if (model.getFirstInvalidLineNumber() < range.getStartPosition().lineNumber) {`
	`427`	`+ return;`
	`428`	`+ }`
`426`	`429`	`const { tabSize, insertSpaces } = model.getOptions();`
`427`	`430`	`this.editor.pushUndoStop();`
`428`	`431`	`let textEdits: TextEdit[] = [];`