From e0b2a8b22f36e4e67ef713e0e6cc596b3d31dbfd Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 28 Jan 2014 15:23:54 +0400 Subject: [PATCH] [vcs] IDEA-119891 Use correct line separators in commit message document --- .../src/com/intellij/openapi/vcs/ui/CommitMessage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java index a1f3b7a125d3..6f4292b203f3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java @@ -24,6 +24,7 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.*; import com.intellij.spellchecker.ui.SpellCheckingEditorCustomization; import com.intellij.ui.*; @@ -143,7 +144,7 @@ public class CommitMessage extends AbstractDataProviderPanel implements Disposab } public void setText(final String initialMessage) { - final String text = initialMessage == null ? "" : initialMessage; + final String text = initialMessage == null ? "" : StringUtil.convertLineSeparators(initialMessage); myEditorField.setText(text); if (myMessageConsumer != null) { myMessageConsumer.consume(text);