From 1beea2f864c1f403ab225dbadfdc398d76faef94 Mon Sep 17 00:00:00 2001
From: Jackson Kearl <jakearl@microsoft.com>
Date: Thu, 5 Dec 2019 14:04:06 -0800
Subject: [PATCH] Fix #86118 for Windows

---
 src/vs/workbench/contrib/search/browser/searchEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/search/browser/searchEditor.ts b/src/vs/workbench/contrib/search/browser/searchEditor.ts
index 9b54955af67..4eee6a2d7fb 100644
--- a/src/vs/workbench/contrib/search/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/search/browser/searchEditor.ts
@@ -47,7 +47,7 @@ const matchToSearchResultFormat = (match: Match): { line: string, ranges: Range[
 			const prefix = `  ${lineNumber}: ${paddingStr}`;
 			const prefixOffset = prefix.length;
 
-			const line = (prefix + sourceLine);
+			const line = (prefix + sourceLine).replace(/\r?\n?$/, '');
 
 			const rangeOnThisLine = ({ start, end }: { start?: number; end?: number; }) => new Range(1, (start ?? 1) + prefixOffset, 1, (end ?? sourceLine.length + 1) + prefixOffset);
 
-- 
GitLab