diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java')
| -rw-r--r-- | python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java index 9a764b94169d..cf6ad38e075d 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.python.refactoring.inline.PyInlineLocalHandler; @@ -97,8 +98,19 @@ public class PyInlineLocalTest extends PyTestCase { // PY-12409 public void testResultExceedsRightMargin() { final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(myFixture.getProject()); - settings.WRAP_LONG_LINES = true; + final CommonCodeStyleSettings commonSettings = settings.getCommonSettings(PythonLanguage.getInstance()); + + final int oldRightMargin = settings.getRightMargin(PythonLanguage.getInstance()); + final boolean oldWrapLongLines = commonSettings.WRAP_LONG_LINES; + settings.setRightMargin(PythonLanguage.getInstance(), 80); - doTest(); + commonSettings.WRAP_LONG_LINES = true; + try { + doTest(); + } + finally { + commonSettings.WRAP_LONG_LINES = oldWrapLongLines; + settings.setRightMargin(PythonLanguage.getInstance(), oldRightMargin); + } } } |