Merge remote-tracking branch 'upstream/master'

idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt

@@ -159,6 +159,10 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
             for (descriptor in descriptorsToImport) {
                 assert(descriptor !in failedToImportDescriptors)
 
+                if (importInserter.optimizeImports()) {
+                    anyChange = true
+                }
+
                 val result = importInserter.addImport(descriptor)
                 if (result != ImportInsertHelper.ImportDescriptorResult.ALREADY_IMPORTED) {
                     anyChange = true
@@ -456,7 +460,6 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
         private val helper = ImportInsertHelper.getInstance(file.getProject())
 
         fun addImport(target: DeclarationDescriptor): ImportInsertHelper.ImportDescriptorResult {
-            optimizeImports()
             return helper.importDescriptor(file, target)
         }
 

idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt

@@ -151,7 +151,8 @@ public class KotlinImportOptimizer() : ImportOptimizer {
 
             val sortedImportsToGenerate = importsToGenerate.sortBy(importInsertHelper.importSortComparator)
 
-            //TODO: do not touch file if everything is already correct?
+            // check if no changes to imports required
+            if (oldImports.size() == sortedImportsToGenerate.size() && oldImports.map { it.getImportPath() } == sortedImportsToGenerate) return
 
             ApplicationManager.getApplication()!!.runWriteAction(Runnable {
                 val importList = file.getImportList()!!

idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt

@@ -331,14 +331,14 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
             }
         }
 
-        private fun detectNeededImports(importedDescriptors: Collection<DeclarationDescriptor>): Set<DeclarationDescriptor> {
+        private fun detectNeededImports(importedClasses: Collection<ClassifierDescriptor>): Set<ClassifierDescriptor> {
-            if (importedDescriptors.isEmpty()) return setOf()
+            if (importedClasses.isEmpty()) return setOf()
 
-            val descriptorsToCheck = importedDescriptors.map { it.getName() to it }.toMap().toLinkedMap()
+            val classesToCheck = importedClasses.map { it.getName() to it }.toMap().toLinkedMap()
-            val result = LinkedHashSet<DeclarationDescriptor>()
+            val result = LinkedHashSet<ClassifierDescriptor>()
             file.accept(object : JetVisitorVoid() {
                 override fun visitElement(element: PsiElement) {
-                    if (descriptorsToCheck.isEmpty()) return
+                    if (classesToCheck.isEmpty()) return
                     element.acceptChildren(this)
                 }
 
@@ -352,11 +352,11 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
                     if (JetPsiUtil.isSelectorInQualified(expression)) return
 
                     val refName = expression.getReferencedNameAsName()
-                    val descriptor = descriptorsToCheck[refName]
+                    val descriptor = classesToCheck[refName]
                     if (descriptor != null) {
                         val targetFqName = targetFqName(expression)
                         if (targetFqName != null && targetFqName == DescriptorUtils.getFqNameSafe(descriptor)) {
-                            descriptorsToCheck.remove(refName)
+                            classesToCheck.remove(refName)
                             result.add(descriptor)
                         }
                     }

idea/testData/addImport/KeywordNames.dependency.kt

@@ -0,0 +1,3 @@
+package foo.`val`
+
+class `var`

idea/testData/addImport/KeywordNames.kt

@@ -0,0 +1,3 @@
+// IMPORT: class: foo.val.var
+// NAME_COUNT_TO_USE_STAR_IMPORT: 10
+package p

idea/testData/addImport/KeywordNames.kt.after

@@ -0,0 +1,5 @@
+// IMPORT: class: foo.val.var
+// NAME_COUNT_TO_USE_STAR_IMPORT: 10
+package p
+
+import foo.`val`.`var`

idea/testData/editor/optimizeImports/DoNotTouchIfNoChanges.kt

@@ -0,0 +1,5 @@
+import java.util.ArrayList
+// some comment
+import java.util.HashSet
+
+val v: HashSet<ArrayList<String>>

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

@@ -0,0 +1,5 @@
+import java.util.ArrayList
+// some comment
+import java.util.HashSet
+
+val v: HashSet<ArrayList<String>>

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

@@ -0,0 +1,3 @@
+package foo.`val`
+
+class `var`

idea/testData/editor/optimizeImports/KeywordNames.kt

@@ -0,0 +1,3 @@
+import foo.`val`.*
+
+var v: `var`? = null

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

@@ -0,0 +1,3 @@
+import foo.`val`.`var`
+
+var v: `var`? = null

idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt

@@ -0,0 +1,5 @@
+// OPTIMIZE_IMPORTS: true
+// NAME_COUNT_TO_USE_STAR_IMPORT: 1
+import java.util.HashMap
+
+val v: HashMap<String, <selection>java.util.Date</selection>>

idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt.after

@@ -0,0 +1,5 @@
+// OPTIMIZE_IMPORTS: true
+// NAME_COUNT_TO_USE_STAR_IMPORT: 1
+import java.util.*
+
+val v: HashMap<String, Date>

idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java

@@ -186,6 +186,12 @@ public class AddImportTestGenerated extends AbstractAddImportTest {
         doTest(fileName);
     }
 
+    @TestMetadata("KeywordNames.kt")
+    public void testKeywordNames() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/KeywordNames.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("NameCountForStarNotReached.kt")
     public void testNameCountForStarNotReached() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/NameCountForStarNotReached.kt");

idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java

@@ -81,6 +81,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
+    @TestMetadata("DoNotTouchIfNoChanges.kt")
+    public void testDoNotTouchIfNoChanges() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DoNotTouchIfNoChanges.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("DuplicatedImports.kt")
     public void testDuplicatedImports() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DuplicatedImports.kt");
@@ -111,6 +117,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
+    @TestMetadata("KeywordNames.kt")
+    public void testKeywordNames() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KeywordNames.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("KotlinPackage.kt")
     public void testKotlinPackage() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KotlinPackage.kt");

idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java

@@ -186,6 +186,12 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("ImportsOnTheFlyBug.kt")
+        public void testImportsOnTheFlyBug() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("leaveQualifiedConstructor.kt")
         public void testLeaveQualifiedConstructor() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt");