Fix microsoft#80707.

rebornix · rebornix · commit 00cd1a88e95f · 2019-10-23T16:57:38.000-07:00
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -577,23 +577,34 @@ export class PieceTreeBase {
 
 		let m: RegExpExecArray | null;
 		// Reset regex to search from the beginning
-		searcher.reset(start);
 		let ret: BufferCursor = { line: 0, column: 0 };
+		let searchText: string;
+		let offsetInBuffer: (offset: number) => number;
+
+		if (searcher._wordSeparators) {
+			searchText = buffer.buffer.substring(start, end);
+			offsetInBuffer = (offset: number) => offset + start;
+			searcher.reset(-1);
+		} else {
+			searchText = buffer.buffer;
+			offsetInBuffer = (offset: number) => offset;
+			searcher.reset(start);
+		}
 
 		do {
-			m = searcher.next(buffer.buffer);
+			m = searcher.next(searchText);
 
 			if (m) {
-				if (m.index >= end) {
+				if (offsetInBuffer(m.index) >= end) {
 					return resultLen;
 				}
-				this.positionInBuffer(node, m.index - startOffsetInBuffer, ret);
+				this.positionInBuffer(node, offsetInBuffer(m.index) - startOffsetInBuffer, ret);
 				let lineFeedCnt = this.getLineFeedCnt(node.piece.bufferIndex, startCursor, ret);
 				let retStartColumn = ret.line === startCursor.line ? ret.column - startCursor.column + startColumn : ret.column + 1;
 				let retEndColumn = retStartColumn + m[0].length;
 				result[resultLen++] = createFindMatch(new Range(startLineNumber + lineFeedCnt, retStartColumn, startLineNumber + lineFeedCnt, retEndColumn), m, captureMatches);
 
-				if (m.index + m[0].length >= end) {
+				if (offsetInBuffer(m.index) + m[0].length >= end) {
 					return resultLen;
 				}
 				if (resultLen >= limitResultCount) {
diff --git a/src/vs/editor/common/model/textModelSearch.ts b/src/vs/editor/common/model/textModelSearch.ts
@@ -510,7 +510,7 @@ export function isValidMatch(wordSeparators: WordCharacterClassifier, text: stri
 }
 
 export class Searcher {
-	private readonly _wordSeparators: WordCharacterClassifier | null;
+	public readonly _wordSeparators: WordCharacterClassifier | null;
 	private readonly _searchRegex: RegExp;
 	private _prevMatchStartIndex: number;
 	private _prevMatchLength: number;

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ export function isValidMatch(wordSeparators: WordCharacterClassifier, text: stri`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`export class Searcher {`
`513`		`- private readonly _wordSeparators: WordCharacterClassifier \| null;`
	`513`	`+ public readonly _wordSeparators: WordCharacterClassifier \| null;`
`514`	`514`	`private readonly _searchRegex: RegExp;`
`515`	`515`	`private _prevMatchStartIndex: number;`
`516`	`516`	`private _prevMatchLength: number;`