From a01ab449975e2c3ca65eb705d29b728eab16abfb Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Thu, 1 Aug 2013 20:35:14 +0400 Subject: [PATCH] IDEA-111004 Edit Fragment: Editing breaks code style, noise in VCS --- .../editorActions/StringLiteralCopyPasteProcessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java index cfb40848e403..eebf0663aaf4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java @@ -30,6 +30,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -154,7 +155,7 @@ public class StringLiteralCopyPasteProcessor implements CopyPastePreProcessor { } protected String getLineBreaker(PsiElement token) { - CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(token.getProject()); + CommonCodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(token.getProject()).getCommonSettings(token.getLanguage()); return codeStyleSettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE ? "\\n\"\n+ \"" : "\\n\" +\n\""; }