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

Avoid recounting auto-import suggesting for outdated quick-fix objects

Browse Source
This commit is contained in:
Nikolay Krasko
2014-12-19 01:41:35 +03:00
parent e479956f57
commit 5777b23955
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt
+23 -16
View File
@@ -53,42 +53,49 @@ import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility
import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.diagnostics.Errors
import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.PsiModificationTracker
import org.jetbrains.jet.utils.CachedValueProperty
import org.jetbrains.jet.plugin.completion.isVisible import org.jetbrains.jet.plugin.completion.isVisible
import org.jetbrains.jet.utils.CachedValueProperty
/** /**
* Check possibility and perform fix for unresolved references. * Check possibility and perform fix for unresolved references.
*/ */
public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<JetSimpleNameExpression>(element), HighPriorityAction { public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<JetSimpleNameExpression>(element), HighPriorityAction {
private val module = ModuleUtilCore.findModuleForPsiElement(element) private val module = ModuleUtilCore.findModuleForPsiElement(element)
private val modificationCountOnCreate = PsiModificationTracker.SERVICE.getInstance(element.getProject()).getModificationCount()
private val suggestions: Collection<FqName> volatile private var anySuggestionFound: Boolean? = null
by CachedValueProperty({ computeSuggestions(element) },
{ PsiModificationTracker.SERVICE.getInstance(element.getProject()).getModificationCount() }) private val suggestions: Collection<FqName> by CachedValueProperty(
{
val fqnames = computeSuggestions(element)
anySuggestionFound = !fqnames.isEmpty()
fqnames
},
{ PsiModificationTracker.SERVICE.getInstance(element.getProject()).getModificationCount() })
override fun showHint(editor: Editor): Boolean { override fun showHint(editor: Editor): Boolean {
if (suggestions.isEmpty()) return false if (!element.isValid() || isOutdated()) return false
val project = editor.getProject() ?: return false
if (HintManager.getInstance().hasShownHintsThatWillHideByOtherHint(true)) return false if (HintManager.getInstance().hasShownHintsThatWillHideByOtherHint(true)) return false
if (suggestions.isEmpty()) return false
if (!ApplicationManager.getApplication()!!.isUnitTestMode()) { if (!ApplicationManager.getApplication()!!.isUnitTestMode()) {
val hintText = ShowAutoImportPass.getMessage(suggestions.size() > 1, suggestions.first().asString()) val hintText = ShowAutoImportPass.getMessage(suggestions.size() > 1, suggestions.first().asString())
val project = editor.getProject() ?: return false
HintManager.getInstance().showQuestionHint(editor, hintText, element.getTextOffset(), element.getTextRange()!!.getEndOffset(), createAction(project, editor)) HintManager.getInstance().showQuestionHint(editor, hintText, element.getTextOffset(), element.getTextRange()!!.getEndOffset(), createAction(project, editor))
} }
return true return true
} }
override fun getText() override fun getText() = JetBundle.message("import.fix")
= JetBundle.message("import.fix")
override fun getFamilyName() override fun getFamilyName() = JetBundle.message("import.fix")
= JetBundle.message("import.fix")
override fun isAvailable(project: Project, editor: Editor, file: PsiFile) override fun isAvailable(project: Project, editor: Editor, file: PsiFile)
= super<JetHintAction>.isAvailable(project, editor, file) && !suggestions.isEmpty() = (super<JetHintAction>.isAvailable(project, editor, file)) && (anySuggestionFound ?: !suggestions.isEmpty())
override fun invoke(project: Project, editor: Editor?, file: JetFile?) { override fun invoke(project: Project, editor: Editor?, file: JetFile?) {
CommandProcessor.getInstance().runUndoTransparentAction { CommandProcessor.getInstance().runUndoTransparentAction {
@@ -96,11 +103,11 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
} }
} }
override fun startInWriteAction() override fun startInWriteAction() = true
= true
private fun createAction(project: Project, editor: Editor) private fun isOutdated() = modificationCountOnCreate != PsiModificationTracker.SERVICE.getInstance(element.getProject()).getModificationCount()
= JetAddImportAction(project, editor, element, suggestions)
private fun createAction(project: Project, editor: Editor) = JetAddImportAction(project, editor, element, suggestions)
private fun computeSuggestions(element: JetSimpleNameExpression): Collection<FqName> { private fun computeSuggestions(element: JetSimpleNameExpression): Collection<FqName> {
if (!element.isValid()) return listOf() if (!element.isValid()) return listOf()
@@ -129,7 +136,7 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
val containingDescriptor = resolutionScope.getContainingDeclaration() val containingDescriptor = resolutionScope.getContainingDeclaration()
fun isVisible(descriptor: DeclarationDescriptor): Boolean { fun isVisible(descriptor: DeclarationDescriptor): Boolean {
if (descriptor is DeclarationDescriptorWithVisibility && containingDescriptor != null) { if (descriptor is DeclarationDescriptorWithVisibility) {
return descriptor.isVisible(containingDescriptor, bindingContext, element) return descriptor.isVisible(containingDescriptor, bindingContext, element)
} }