Do not try to copy references in dumb mode

#KT-4766 Fixed
JetBrains · Oct 7, 2014 · 1e9718f · 1e9718f
1 parent 23fa0ba
commit 1e9718f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/annotations/com/intellij/openapi/project/annotations.xml b/annotations/com/intellij/openapi/project/annotations.xml
@@ -0,0 +1,6 @@
+<root>
+    <item
+        name='com.intellij.openapi.project.DumbService com.intellij.openapi.project.DumbService getInstance(com.intellij.openapi.project.Project)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -68,7 +68,7 @@ import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension
 public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<ReferenceTransferableData>() {
 
     override fun extractTransferableData(content: Transferable): List<ReferenceTransferableData> {
-        if (CodeInsightSettings.getInstance()!!.ADD_IMPORTS_ON_PASTE != CodeInsightSettings.NO) {
+        if (CodeInsightSettings.getInstance().ADD_IMPORTS_ON_PASTE != CodeInsightSettings.NO) {
             try {
                 val flavor = ReferenceData.getDataFlavor()
                 if (flavor != null) {
@@ -94,7 +94,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
             startOffsets: IntArray,
             endOffsets: IntArray
     ): List<ReferenceTransferableData> {
-        if (file !is JetFile) {
+        if (file !is JetFile || DumbService.getInstance(file.getProject()).isDumb()) {
             return listOf()
         }
 
@@ -184,7 +184,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
             indented: Ref<Boolean>,
             values: List<ReferenceTransferableData>
     ) {
-        if (DumbService.getInstance(project)!!.isDumb()) {
+        if (DumbService.getInstance(project).isDumb()) {
             return
         }
         val document = editor.getDocument()
@@ -289,7 +289,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
     }
 
     private fun showRestoreReferencesDialog(project: Project, referencesToRestore: List<ReferenceToRestoreData>): Collection<ReferenceToRestoreData> {
-        val shouldShowDialog = CodeInsightSettings.getInstance()!!.ADD_IMPORTS_ON_PASTE == CodeInsightSettings.ASK
+        val shouldShowDialog = CodeInsightSettings.getInstance().ADD_IMPORTS_ON_PASTE == CodeInsightSettings.ASK
         if (!shouldShowDialog || referencesToRestore.isEmpty()) {
             return referencesToRestore
         }