Implement more precise diagnostic when a standard script template is missing

adapt quickfix accordingly
#KT-26505 fixed
This commit is contained in:
Ilya Chernikov
2018-09-26 16:50:54 +02:00
parent b1c4590537
commit c50e880173
5 changed files with 11 additions and 12 deletions
@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtImportDirective
import org.jetbrains.kotlin.psi.KtScript
class AddReflectionQuickFix(element: KtElement)
: AddKotlinLibQuickFix(element, listOf(LibraryJarDescriptor.REFLECT_JAR,
@@ -63,16 +62,9 @@ class AddScriptRuntimeQuickFix(element: KtElement) : AddKotlinLibQuickFix(elemen
)
companion object : KotlinSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtElement>? {
val ktScript = Errors.MISSING_SCRIPT_BASE_CLASS.cast(diagnostic).psiElement as? KtScript ?: return null
val templateClassName = ktScript.kotlinScriptDefinition.value.template.qualifiedName ?: return null
if (templateClassName.startsWith("kotlin.script.templates.standard")) {
return diagnostic.createIntentionForFirstParentOfType(::AddScriptRuntimeQuickFix)
}
return null
}
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtElement>? =
diagnostic.createIntentionForFirstParentOfType(::AddScriptRuntimeQuickFix)
}
}
@@ -41,6 +41,6 @@ class JvmQuickFixRegistrar : QuickFixContributor {
NO_REFLECTION_IN_CLASS_PATH.registerFactory(AddReflectionQuickFix)
MISSING_SCRIPT_BASE_CLASS.registerFactory(AddScriptRuntimeQuickFix)
MISSING_SCRIPT_STANDARD_TEMPLATE.registerFactory(AddScriptRuntimeQuickFix)
}
}