search: fix copy all containing extraneous crlf line endings

Fixes #65348
microsoft · Nov 13, 2020 · 5da5495 · 5da5495
1 parent fbaf7b1
commit 5da5495
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
@@ -891,9 +891,15 @@ export function getNLines(str: string, n = 1): string {
 		n--;
 	} while (n > 0 && idx >= 0);
 
-	return idx >= 0 ?
-		str.substr(0, idx) :
-		str;
+	if (idx === -1) {
+		return str;
+	}
+
+	if (str[idx - 1] === '\r') {
+		idx--;
+	}
+
+	return str.substr(0, idx);
 }
 
 /**

diff --git a/src/vs/workbench/services/search/test/common/search.test.ts b/src/vs/workbench/services/search/test/common/search.test.ts
@@ -109,6 +109,17 @@ suite('TextSearchResult', () => {
 		assert.equal(result.preview.text, 'foo bar 123456⟪ 117 characters skipped ⟫o bar baz bar');
 	});
 
+	test('trims lines endings', () => {
+		const range = new SearchRange(5, 3, 5, 5);
+		const previewOptions: ITextSearchPreviewOptions = {
+			matchLines: 1,
+			charsPerLine: 10000
+		};
+
+		assert.equal(new TextSearchMatch('foo bar\n', range, previewOptions).preview.text, 'foo bar');
+		assert.equal(new TextSearchMatch('foo bar\r\n', range, previewOptions).preview.text, 'foo bar');
+	});
+
 	// test('all lines of multiline match', () => {
 	// 	const previewOptions: ITextSearchPreviewOptions = {
 	// 		matchLines: 5,