[kotlin] Ignore backticks when comparing imports

This helps preserve their ordering when sorted lexicographically ^KTIJ-19394 Fixed closes #1879 GitOrigin-RevId: ebc5922726a030aff75903fe130a06791166b18c
JetBrains · Dec 20, 2021 · ce851ed · ce851ed
1 parent 89db917
commit ce851ed
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 1 deletion.
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/util/ImportPathComparator.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/util/ImportPathComparator.kt
@@ -17,7 +17,10 @@ internal class ImportPathComparator(private val packageTable: KotlinPackageEntry
             import1,
             import2,
             { import -> bestEntryMatchIndex(import, ignoreAlias) },
-            { import -> import.toString() }
+            { import ->
+                // Ignore backticks when comparing lexicographically
+                import.toString().replace("`", "")
+            }
         )
     }
 

diff --git a/...lin/idea/tests/test/org/jetbrains/kotlin/idea/imports/JsOptimizeImportsTestGenerated.java b/...lin/idea/tests/test/org/jetbrains/kotlin/idea/imports/JsOptimizeImportsTestGenerated.java
@@ -82,6 +82,11 @@ public void testArrayAccessExpression() throws Exception {
                     runTest("testData/editor/optimizeImports/common/ArrayAccessExpression.kt");
                 }
 
+                @TestMetadata("BacktickSort.kt")
+                public void testBacktickSort() throws Exception {
+                    runTest("testData/editor/optimizeImports/common/BacktickSort.kt");
+                }
+
                 @TestMetadata("ClassMemberImported.kt")
                 public void testClassMemberImported() throws Exception {
                     runTest("testData/editor/optimizeImports/common/ClassMemberImported.kt");

diff --git a/...in/idea/tests/test/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java b/...in/idea/tests/test/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java
@@ -331,6 +331,11 @@ public void testArrayAccessExpression() throws Exception {
                     runTest("testData/editor/optimizeImports/common/ArrayAccessExpression.kt");
                 }
 
+                @TestMetadata("BacktickSort.kt")
+                public void testBacktickSort() throws Exception {
+                    runTest("testData/editor/optimizeImports/common/BacktickSort.kt");
+                }
+
                 @TestMetadata("ClassMemberImported.kt")
                 public void testClassMemberImported() throws Exception {
                     runTest("testData/editor/optimizeImports/common/ClassMemberImported.kt");

diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/BacktickSort.dependency.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/BacktickSort.dependency.kt
@@ -0,0 +1,5 @@
+package b
+
+fun `fun`() {}
+fun g() {}
+fun `val`() {}
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/BacktickSort.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/BacktickSort.kt
@@ -0,0 +1,14 @@
+package a
+
+// Should be sorted, ignoring backticks
+import b.g
+import b.`fun`
+import b.`val`
+
+class Foo(
+    fun bar() {
+        g()
+        `fun`()
+        `val`()
+    }
+)
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/BacktickSort.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/BacktickSort.kt.after
@@ -0,0 +1,14 @@
+package a
+
+// Should be sorted, ignoring backticks
+import b.`fun`
+import b.g
+import b.`val`
+
+class Foo(
+    fun bar() {
+        g()
+        `fun`()
+        `val`()
+    }
+)