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

ReplaceWithAnnotationAnalyzer: should throw ControlFlowException

Browse Source
This commit is contained in:
Dmitry Gridin
2020-04-03 14:06:53 +07:00
parent d5ace43614
commit dc51a268aa
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt
+3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.idea.quickfix.replaceWith package org.jetbrains.kotlin.idea.quickfix.replaceWith
import com.intellij.openapi.diagnostic.ControlFlowException
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.idea.analysis.analyzeInContext import org.jetbrains.kotlin.idea.analysis.analyzeInContext
@@ -59,6 +60,7 @@ object ReplaceWithAnnotationAnalyzer {
val expression = try { val expression = try {
psiFactory.createExpression(annotation.pattern) psiFactory.createExpression(annotation.pattern)
} catch (t: Throwable) { } catch (t: Throwable) {
if (t is ControlFlowException) throw t
return null return null
} }
@@ -82,6 +84,7 @@ object ReplaceWithAnnotationAnalyzer {
val typeReference = try { val typeReference = try {
psiFactory.createType(annotation.pattern) psiFactory.createType(annotation.pattern)
} catch (e: Exception) { } catch (e: Exception) {
if (e is ControlFlowException) throw e
return null return null
} }
if (typeReference.typeElement !is KtUserType) return null if (typeReference.typeElement !is KtUserType) return null