diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseImportMap.properties b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseImportMap.properties index 6ec7b84527fb..1f868468a331 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseImportMap.properties +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseImportMap.properties @@ -60,7 +60,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_package=Java:BLANK_LINES_BEFOR #org.eclipse.jdt.core.formatter.comment.format_line_comments= #org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments= #org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations= -#org.eclipse.jdt.core.formatter.join_wrapped_lines= +org.eclipse.jdt.core.formatter.join_wrapped_lines=Java:KEEP_LINE_BREAKS org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=Java: #org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call= org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=Java:SPACE_BEFORE_COMMA diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseSettingsImportTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseSettingsImportTest.java index 278d7cace7fb..6aa242e4b0cb 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseSettingsImportTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseSettingsImportTest.java @@ -143,6 +143,7 @@ public class EclipseSettingsImportTest extends PlatformTestCase { javaSettings.SPACE_BEFORE_METHOD_LBRACE = false; javaSettings.SPACE_BEFORE_CLASS_LBRACE = false; javaSettings.SPACE_BEFORE_ANOTATION_PARAMETER_LIST = true; + javaSettings.KEEP_LINE_BREAKS = false; InputStream inputStream = new FileInputStream(input); try { @@ -257,6 +258,7 @@ public class EclipseSettingsImportTest extends PlatformTestCase { assertTrue(javaSettings.SPACE_BEFORE_METHOD_LBRACE); assertTrue(javaSettings.SPACE_BEFORE_CLASS_LBRACE); assertFalse(javaSettings.SPACE_BEFORE_ANOTATION_PARAMETER_LIST); + assertTrue(javaSettings.KEEP_LINE_BREAKS); } finally { inputStream.close();