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

Fix NPE in KotlinRunConfiguration & do not throw exception on unknown container type (EA-209426)

Browse Source
This commit is contained in:
Ilya Kirillov
2019-09-25 11:13:06 +03:00
parent 9deb7dc8d6
commit 016132c762
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
+1
View File
@@ -277,6 +277,7 @@ public class KotlinRunConfiguration extends JetRunConfiguration {
private void updateMainClassName(PsiElement element) { private void updateMainClassName(PsiElement element) {
KtDeclarationContainer container = KotlinRunConfigurationProducer.Companion.getEntryPointContainer(element); KtDeclarationContainer container = KotlinRunConfigurationProducer.Companion.getEntryPointContainer(element);
if (container == null) return;
String name = KotlinRunConfigurationProducer.Companion.getStartClassFqName(container); String name = KotlinRunConfigurationProducer.Companion.getStartClassFqName(container);
if (name != null) { if (name != null) {
MAIN_CLASS_NAME = name; MAIN_CLASS_NAME = name;
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationProducer.kt
+1 -1
View File
@@ -101,7 +101,7 @@ class KotlinRunConfigurationProducer : RunConfigurationProducer<KotlinRunConfigu
container.toLightClass()?.let { ClassUtil.getJVMClassName(it) } container.toLightClass()?.let { ClassUtil.getJVMClassName(it) }
} }
} }
else -> throw IllegalArgumentException("Invalid entry-point container: " + (container as PsiElement).text) else -> null
} }
private fun PsiElement.declarationContainer(strict: Boolean): KtDeclarationContainer? { private fun PsiElement.declarationContainer(strict: Boolean): KtDeclarationContainer? {