Reduce usage of IValidatedEditOperation.lines

src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts

@@ -18,6 +18,9 @@ export interface IValidatedEditOperation {
 	rangeOffset: number;
 	rangeLength: number;
 	lines: string[] | null;
+	text: string | null;
+	firstLine: string | null;
+	lastLine: string | null;
 	forceMoveMarkers: boolean;
 	isAutoWhitespaceEdit: boolean;
 }
@@ -223,31 +226,52 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 			}
 
 			let lines: string[] | null = null;
+			let firstLine: string | null = null;
+			let lastLine: string | null = null;
+			let validText: string | null = null;
 			if (op.text) {
+				const eol = this.getEOL();
+
 				lines = [];
 				let linesLen = 0;
 				let lastLineStart = 0;
+				let textIsValid = true;
 				for (let j = 0, len = op.text.length; j < len; j++) {
 					const chr = op.text.charCodeAt(j);
-
 					if (chr === CharCode.CarriageReturn) {
 						if (j + 1 < len && op.text.charCodeAt(j + 1) === CharCode.LineFeed) {
 							// \r\n... case
+							if (eol !== '\r\n') {
+								textIsValid = false;
+							}
 							lines[linesLen++] = op.text.substring(lastLineStart, j);
 							lastLineStart = j + 2;
 							j++; // skip \n
 						} else {
 							// \r... case
+							textIsValid = false;
 							lines[linesLen++] = op.text.substring(lastLineStart, j);
 							lastLineStart = j + 1;
 						}
 					} else if (chr === CharCode.LineFeed) {
 						// \n... case
+						if (eol !== '\n') {
+							textIsValid = false;
+						}
 						lines[linesLen++] = op.text.substring(lastLineStart, j);
 						lastLineStart = j + 1;
 					}
 				}
-				lines[linesLen++] = op.text.substring(lastLineStart, op.text.length);
+				lastLine = op.text.substring(lastLineStart, op.text.length);
+				lines[linesLen++] = lastLine;
+
+				if (textIsValid) {
+					validText = op.text;
+				} else {
+					validText = lines.join(eol);
+				}
+
+				firstLine = lines[0];
 			}
 
 			operations[i] = {
@@ -257,6 +281,9 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 				rangeOffset: this.getOffsetAt(validatedRange.startLineNumber, validatedRange.startColumn),
 				rangeLength: this.getValueLengthInRange(validatedRange),
 				lines: lines,
+				text: validText,
+				firstLine: firstLine,
+				lastLine: lastLine,
 				forceMoveMarkers: Boolean(op.forceMoveMarkers),
 				isAutoWhitespaceEdit: op.isAutoWhitespaceEdit || false
 			};
@@ -425,13 +452,20 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 			lastEndColumn = operation.range.endColumn;
 		}
 
+		const lines = result.join('').split('\n');
+		const firstLine = lines[0];
+		const lastLine = lines[lines.length - 1];
+
 		return {
 			sortIndex: 0,
 			identifier: operations[0].identifier,
 			range: entireEditRange,
 			rangeOffset: this.getOffsetAt(entireEditRange.startLineNumber, entireEditRange.startColumn),
 			rangeLength: this.getValueLengthInRange(entireEditRange, EndOfLinePreference.TextDefined),
-			lines: result.join('').split('\n'),
+			lines: lines,
+			text: lines.join(this.getEOL()),
+			firstLine: firstLine,
+			lastLine: lastLine,
 			forceMoveMarkers: forceMoveMarkers,
 			isAutoWhitespaceEdit: false
 		};
@@ -451,12 +485,12 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 			const endLineNumber = op.range.endLineNumber;
 			const endColumn = op.range.endColumn;
 
-			if (startLineNumber === endLineNumber && startColumn === endColumn && (!op.lines || op.lines.length === 0)) {
+			if (startLineNumber === endLineNumber && startColumn === endColumn && (!op.text || op.text.length === 0)) {
 				// no-op
 				continue;
 			}
 
-			const text = (op.lines ? op.lines.join(this.getEOL()) : '');
+			const text = op.text ? op.text : '';
 
 			if (text) {
 				// replacement

src/vs/editor/common/model/tokensStore.ts

@@ -11,10 +11,18 @@ import { ColorId, FontStyle, LanguageId, MetadataConsts, StandardTokenType, Toke
 import { writeUInt32BE, readUInt32BE } from 'vs/base/common/buffer';
 import { CharCode } from 'vs/base/common/charCode';
 
-export function countEOL(text: string): [number, number, number] {
+export const enum StringEOL {
+	Unknown = 0,
+	Invalid = 3,
+	LF = 1,
+	CRLF = 2
+}
+
+export function countEOL(text: string): [number, number, number, StringEOL] {
 	let eolCount = 0;
 	let firstLineLength = 0;
 	let lastLineStart = 0;
+	let eol: StringEOL = StringEOL.Unknown;
 	for (let i = 0, len = text.length; i < len; i++) {
 		const chr = text.charCodeAt(i);
 
@@ -25,12 +33,16 @@ export function countEOL(text: string): [number, number, number] {
 			eolCount++;
 			if (i + 1 < len && text.charCodeAt(i + 1) === CharCode.LineFeed) {
 				// \r\n... case
+				eol |= StringEOL.CRLF;
 				i++; // skip \n
 			} else {
 				// \r... case
+				eol |= StringEOL.Invalid;
 			}
 			lastLineStart = i + 1;
 		} else if (chr === CharCode.LineFeed) {
+			// \n... case
+			eol |= StringEOL.LF;
 			if (eolCount === 0) {
 				firstLineLength = i;
 			}
@@ -41,7 +53,7 @@ export function countEOL(text: string): [number, number, number] {
 	if (eolCount === 0) {
 		firstLineLength = text.length;
 	}
-	return [eolCount, firstLineLength, text.length - lastLineStart];
+	return [eolCount, firstLineLength, text.length - lastLineStart, eol];
 }
 
 function getDefaultMetadata(topLevelLanguageId: LanguageId): number {

src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts

@@ -19,6 +19,9 @@ suite('PieceTreeTextBuffer._getInverseEdits', () => {
 			rangeOffset: 0,
 			rangeLength: 0,
 			lines: text,
+			text: text ? text.join('\n') : null,
+			firstLine: text ? text[0] : null,
+			lastLine: text ? text[text.length - 1] : null,
 			forceMoveMarkers: false,
 			isAutoWhitespaceEdit: false
 		};
@@ -270,6 +273,9 @@ suite('PieceTreeTextBuffer._toSingleEditOperation', () => {
 			rangeOffset: rangeOffset,
 			rangeLength: rangeLength,
 			lines: text,
+			text: text ? text.join('\n') : null,
+			firstLine: text ? text[0] : null,
+			lastLine: text ? text[text.length - 1] : null,
 			forceMoveMarkers: false,
 			isAutoWhitespaceEdit: false
 		};