From a946fcae88068397e3c42a797e4bac80061216eb Mon Sep 17 00:00:00 2001 From: Sylvain Joyeux Date: Tue, 12 Dec 2017 10:33:28 -0200 Subject: [PATCH] separate lines with \r\n on Windows --- src/vs/platform/markers/common/problemMatcher.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/platform/markers/common/problemMatcher.ts b/src/vs/platform/markers/common/problemMatcher.ts index 6a8ac03cb5d..357588fb977 100644 --- a/src/vs/platform/markers/common/problemMatcher.ts +++ b/src/vs/platform/markers/common/problemMatcher.ts @@ -12,6 +12,7 @@ import * as Assert from 'vs/base/common/assert'; import * as Paths from 'vs/base/common/paths'; import * as Types from 'vs/base/common/types'; import * as UUID from 'vs/base/common/uuid'; +import * as Platform from 'vs/base/common/platform'; import Severity from 'vs/base/common/severity'; import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -189,6 +190,8 @@ export function createLineMatcher(matcher: ProblemMatcher): ILineMatcher { } } +const endOfLine: string = Platform.OS === Platform.OperatingSystem.Windows ? '\r\n' : '\n'; + abstract class AbstractLineMatcher implements ILineMatcher { private matcher: ProblemMatcher; @@ -227,7 +230,7 @@ abstract class AbstractLineMatcher implements ILineMatcher { if (trim) { value = Strings.trim(value); } - data[property] += '\n' + value; + data[property] += endOfLine + value; } } -- GitLab