azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not try to copy references in dumb mode

Browse Source 
#KT-4766 Fixed
This commit is contained in:
Pavel V. Talanov
2014-10-07 16:28:48 +04:00
parent 23fa0ba6ab
commit 1e9718f55b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
annotations/com/intellij/openapi/project/annotations.xml
+6
View File
@@ -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>
idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+4 -4
View File
@@ -68,7 +68,7 @@ import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension
public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<ReferenceTransferableData>() { public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<ReferenceTransferableData>() {
override fun extractTransferableData(content: Transferable): List<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 { try {
val flavor = ReferenceData.getDataFlavor() val flavor = ReferenceData.getDataFlavor()
if (flavor != null) { if (flavor != null) {
@@ -94,7 +94,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
startOffsets: IntArray, startOffsets: IntArray,
endOffsets: IntArray endOffsets: IntArray
): List<ReferenceTransferableData> { ): List<ReferenceTransferableData> {
if (file !is JetFile) { if (file !is JetFile || DumbService.getInstance(file.getProject()).isDumb()) {
return listOf() return listOf()
} }
@@ -184,7 +184,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
indented: Ref<Boolean>, indented: Ref<Boolean>,
values: List<ReferenceTransferableData> values: List<ReferenceTransferableData>
) { ) {
if (DumbService.getInstance(project)!!.isDumb()) { if (DumbService.getInstance(project).isDumb()) {
return return
} }
val document = editor.getDocument() val document = editor.getDocument()
@@ -289,7 +289,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
} }
private fun showRestoreReferencesDialog(project: Project, referencesToRestore: List<ReferenceToRestoreData>): Collection<ReferenceToRestoreData> { 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()) { if (!shouldShowDialog || referencesToRestore.isEmpty()) {
return referencesToRestore return referencesToRestore
} }