diff --git a/.editorconfig b/.editorconfig
index 32462cf3a281..f9c0dc9b3fa7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -55,7 +55,7 @@ ij_java_blank_lines_around_initializer = 1
 ij_java_blank_lines_around_method = 1
 ij_java_blank_lines_around_method_in_interface = 1
 ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_imports = 0
 ij_java_blank_lines_before_method_body = 0
 ij_java_blank_lines_before_package = 0
 ij_java_block_brace_style = end_of_line
@@ -292,7 +292,7 @@ ij_scala_blank_lines_around_field_in_interface = 0
 ij_scala_blank_lines_around_method = 1
 ij_scala_blank_lines_around_method_in_inner_scopes = 1
 ij_scala_blank_lines_around_method_in_interface = 1
-ij_scala_blank_lines_before_imports = 1
+ij_scala_blank_lines_before_imports = 0
 ij_scala_blank_lines_before_method_body = 0
 ij_scala_blank_lines_before_package = 0
 ij_scala_block_brace_style = end_of_line
@@ -452,7 +452,7 @@ ij_scala_wrap_long_lines = false
 [.editorconfig]
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_after_comma = false
 ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
@@ -485,6 +485,7 @@ ij_shell_redirect_followed_by_space = false
 ij_shell_switch_cases_indented = false
 
 [{*.gant,*.gradle,*.groovy,*.gson,*.gy}]
+ij_continuation_indent_size = 2
 ij_groovy_align_group_field_declarations = false
 ij_groovy_align_multiline_array_initializer_expression = false
 ij_groovy_align_multiline_assignment = false
@@ -515,7 +516,7 @@ ij_groovy_blank_lines_around_field = 0
 ij_groovy_blank_lines_around_field_in_interface = 0
 ij_groovy_blank_lines_around_method = 1
 ij_groovy_blank_lines_around_method_in_interface = 1
-ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_imports = 0
 ij_groovy_blank_lines_before_method_body = 0
 ij_groovy_blank_lines_before_package = 0
 ij_groovy_block_brace_style = end_of_line
@@ -526,7 +527,7 @@ ij_groovy_call_parameters_wrap = off
 ij_groovy_catch_on_new_line = false
 ij_groovy_class_annotation_wrap = split_into_lines
 ij_groovy_class_brace_style = end_of_line
-ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_class_count_to_use_import_on_demand = 999
 ij_groovy_do_while_brace_force = never
 ij_groovy_else_on_new_line = false
 ij_groovy_enum_constants_wrap = off
@@ -568,7 +569,7 @@ ij_groovy_method_parameters_new_line_after_left_paren = false
 ij_groovy_method_parameters_right_paren_on_new_line = false
 ij_groovy_method_parameters_wrap = off
 ij_groovy_modifier_list_wrap = false
-ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_names_count_to_use_import_on_demand = 999
 ij_groovy_parameter_annotation_wrap = off
 ij_groovy_parentheses_expression_new_line_after_left_paren = false
 ij_groovy_parentheses_expression_right_paren_on_new_line = false