From e478ce1c88c7625cb4f790a839d5fdc385e28fdb Mon Sep 17 00:00:00 2001 From: Nick Tindall Date: Fri, 7 Mar 2025 16:08:07 +1100 Subject: [PATCH] Revert "Add temporary workaround for IntelliJ editorconfig bug (#123954)" (#124286) This reverts (most of) commit 2f14649f1678884d8440225c807c2418c3e97918. --- .editorconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 57ddc020b524..774fd201ef8d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -209,9 +209,7 @@ indent_size = 4 max_line_length = 140 ij_java_class_count_to_use_import_on_demand = 999 ij_java_names_count_to_use_import_on_demand = 999 -# The first '@*,' is a workaround for https://youtrack.jetbrains.com/issue/IDEA-368382/Auto-import-puts-java-imports-first-even-when-Editor-Code-style-Java-Import-layout-puts-them-last -# it should be removed once that is fixed -ij_java_imports_layout = @*,*,|,com.**,|,org.**,|,java.**,|,javax.**,|,$* +ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,|,javax.**,|,$* [*.json] indent_size = 2