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

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

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-04 14:25:32 +04:00
parent 59b33fcba4
commit fde7e52bf0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt
+2
View File
@@ -99,6 +99,8 @@ class FqNameReplacement(val fqName: FqName): Replacement {
trait ControlFlow { trait ControlFlow {
val returnType: JetType val returnType: JetType
val declarationsToCopy: List<JetDeclaration> val declarationsToCopy: List<JetDeclaration>
fun toDefault(): ControlFlow = DefaultControlFlow(returnType, declarationsToCopy)
} }
class DefaultControlFlow( class DefaultControlFlow(
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+1 -1
View File
@@ -636,7 +636,7 @@ fun ExtractionData.performAnalysis(): AnalysisResult {
receiverParameter, receiverParameter,
typeParameters.sortBy { it.originalDeclaration.getName()!! }, typeParameters.sortBy { it.originalDeclaration.getName()!! },
replacementMap, replacementMap,
controlFlow if (messages.empty) controlFlow else controlFlow.toDefault()
), ),
if (messages.empty) Status.SUCCESS else Status.NON_CRITICAL_ERROR, if (messages.empty) Status.SUCCESS else Status.NON_CRITICAL_ERROR,
messages messages