diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java')
| -rw-r--r-- | java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java index ed79f2f60bc6..5749fe80b549 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java @@ -17,6 +17,7 @@ package com.intellij.psi.formatter.java; import com.intellij.lang.java.JavaLanguage; import com.intellij.psi.codeStyle.CodeStyleManager; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; import org.jetbrains.annotations.NotNull; @@ -32,8 +33,9 @@ public class JavaFormatterInEditorTest extends LightPlatformCodeInsightTestCase public void testCaretPositionOnLongLineWrapping() throws IOException { // Inspired by IDEA-70242 - getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; - getCurrentCodeStyleSettings().RIGHT_MARGIN = 40; + CommonCodeStyleSettings javaCommonSettings = getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE); + javaCommonSettings.WRAP_LONG_LINES = true; + javaCommonSettings.RIGHT_MARGIN = 40; doTest( "import static java.util.concurrent.atomic.AtomicInteger.*;\n" + "\n" + |