Extract Function: Always assume default control flow if non-critical errors are found

2014-07-04 14:25:32 +04:00
parent 59b33fcba4
commit fde7e52bf0
2 changed files with 3 additions and 1 deletions
@@ -99,6 +99,8 @@ class FqNameReplacement(val fqName: FqName): Replacement {
 trait ControlFlow {
    val returnType: JetType
    val declarationsToCopy: List<JetDeclaration>
+
+    fun toDefault(): ControlFlow = DefaultControlFlow(returnType, declarationsToCopy)
 }

 class DefaultControlFlow(
@@ -636,7 +636,7 @@ fun ExtractionData.performAnalysis(): AnalysisResult {
                    receiverParameter,
                    typeParameters.sortBy { it.originalDeclaration.getName()!! },
                    replacementMap,
-                    controlFlow
+                    if (messages.empty) controlFlow else controlFlow.toDefault()
            ),
            if (messages.empty) Status.SUCCESS else Status.NON_CRITICAL_ERROR,
            messages