From c8a8410fc5c66ad55698d8c031ee96b42a8962e6 Mon Sep 17 00:00:00 2001 From: Alexander Dudinsky Date: Wed, 28 Oct 2020 22:35:43 +0300 Subject: [PATCH] Fix MultiModuleLineMarkerTest on Windows --- .../AbstractCodeMetaInfoRenderConfiguration.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt index 2a27efcce1e..6fff12d11d6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt @@ -32,7 +32,11 @@ abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean } protected fun sanitizeLineBreaks(originalText: String): String { - return StringUtil.replace(originalText, "\n", " ") + var sanitizedText = originalText + sanitizedText = StringUtil.replace(sanitizedText, "\r\n", " ") + sanitizedText = StringUtil.replace(sanitizedText, "\n", " ") + sanitizedText = StringUtil.replace(sanitizedText, "\r", " ") + return sanitizedText } protected fun getPlatformsString(codeMetaInfo: CodeMetaInfo): String {