Fixed optimize imports for operators

idea/testData/editor/optimizeImports/Operators.dependency.kt

@@ -0,0 +1,7 @@
+package p1
+
+operator fun Runnable.plus(p: Int): Runnable = TODO()
+operator fun Runnable.minus(p: Int): Runnable = TODO()
+operator fun Runnable.timesAssign(p: Int): Unit = TODO()
+operator fun Runnable.div(p: Int): Runnable = TODO()
+operator fun Runnable.unaryMinus(): Runnable = TODO()

idea/testData/editor/optimizeImports/Operators.kt

@@ -0,0 +1,9 @@
+// NAME_COUNT_TO_USE_STAR_IMPORT: 5
+import p1.*
+
+fun f(runnable: Runnable) {
+    var r = -runnable
+    print(r + 1)
+    r /= 2
+    r *= 3
+}

idea/testData/editor/optimizeImports/Operators.kt.after

@@ -0,0 +1,12 @@
+// NAME_COUNT_TO_USE_STAR_IMPORT: 5
+import p1.div
+import p1.plus
+import p1.timesAssign
+import p1.unaryMinus
+
+fun f(runnable: Runnable) {
+    var r = -runnable
+    print(r + 1)
+    r /= 2
+    r *= 3
+}

idea/testData/editor/optimizeImports/PlusAndPlusAssign.dependency1.kt

@@ -0,0 +1,3 @@
+package p1
+
+operator fun Runnable.plus(p: Int): Runnable = TODO()

idea/testData/editor/optimizeImports/PlusAndPlusAssign.dependency2.kt

@@ -0,0 +1,7 @@
+package p2
+
+operator fun Runnable.plusAssign(p: Int): Unit = TODO()
+
+val v1 = 1
+val v2 = 1
+val v3 = 1

idea/testData/editor/optimizeImports/PlusAndPlusAssign.kt

@@ -0,0 +1,11 @@
+// NAME_COUNT_TO_USE_STAR_IMPORT: 2
+import p1.plus
+import p2.v1
+import p2.v2
+import p2.v3
+
+fun f(runnable: Runnable) {
+    var r = runnable
+    r += 1
+    v1 + v2 + v3
+}

idea/testData/editor/optimizeImports/PlusAndPlusAssign.kt.after

@@ -0,0 +1,11 @@
+// NAME_COUNT_TO_USE_STAR_IMPORT: 2
+import p1.plus
+import p2.v1
+import p2.v2
+import p2.v3
+
+fun f(runnable: Runnable) {
+    var r = runnable
+    r += 1
+    v1 + v2 + v3
+}

idea/testData/editor/optimizeImports/PlusAndPlusAssign.kt.log

@@ -0,0 +1,3 @@
+Additional checking of reference KtSimpleNameReference: +=
+Changed resolve of KtSimpleNameReference: +=
+Trying to build import list again with locked imports: -p2.*, p1.plus