diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.java index 47147f47124..d23cda0deec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.java +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.java @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.formatter; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; @@ -41,7 +42,7 @@ public class JetCodeStyleSettings extends CustomCodeStyleSettings { public boolean LBRACE_ON_NEXT_LINE = false; - public boolean PREFER_ALL_UNDER_IMPORTS = false; + public boolean PREFER_ALL_UNDER_IMPORTS = !ApplicationManager.getApplication().isUnitTestMode(); public boolean IMPORT_PACKAGES = true; public static JetCodeStyleSettings getInstance(Project project) {