From 3799978dea41e096328beacaa7c04ce69f070d3c Mon Sep 17 00:00:00 2001 From: Nick Tindall Date: Fri, 7 Mar 2025 14:22:36 +1100 Subject: [PATCH 1/2] Revert "Add temporary workaround for IntelliJ editorconfig bug (#123954)" This reverts commit 2f14649f1678884d8440225c807c2418c3e97918. --- .editorconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 57ddc020b5243..eeff76dd66163 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.**,|,io.**,|,org.**,|,java.**,|,javax.**,|,$* [*.json] indent_size = 2 From 7f7a44ad0936aca090ec309c9d2c13f548c7cbc4 Mon Sep 17 00:00:00 2001 From: Nick Tindall Date: Fri, 7 Mar 2025 14:45:53 +1100 Subject: [PATCH 2/2] Leave io.** out of revert --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index eeff76dd66163..774fd201ef8d5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -209,7 +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 -ij_java_imports_layout = *,|,com.**,|,io.**,|,org.**,|,java.**,|,javax.**,|,$* +ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,|,javax.**,|,$* [*.json] indent_size = 2