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

Make code in IntroduceIndexMatcher safer

Browse Source 
EA-101119 Fixed
This commit is contained in:
Mikhail Glukhikh
2018-08-15 17:47:29 +03:00
parent d67dea4619
commit 57153cc2fc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/IntroduceIndexMatcher.kt
+2 -2
View File
@@ -69,8 +69,8 @@ object IntroduceIndexMatcher : TransformationMatcher {
val pseudocode = state.pseudocodeProvider() val pseudocode = state.pseudocodeProvider()
val firstStatement = state.statements.first() val firstStatement = state.statements.first()
val firstInstruction = pseudocode.instructionForElement(firstStatement)!! val firstInstruction = pseudocode.instructionForElement(firstStatement) ?: return null
val incrementInstruction = pseudocode.instructionForElement(incrementExpression)!! val incrementInstruction = pseudocode.instructionForElement(incrementExpression) ?: return null
if (!isAlwaysReachedOrExitedLoop(firstInstruction, incrementInstruction, state.outerLoop, state.innerLoop)) return null if (!isAlwaysReachedOrExitedLoop(firstInstruction, incrementInstruction, state.outerLoop, state.innerLoop)) return null
val variableDescriptor = variable.unsafeResolveToDescriptor() as VariableDescriptor val variableDescriptor = variable.unsafeResolveToDescriptor() as VariableDescriptor