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

Renamed class

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-05 17:47:35 +03:00
parent 29831f648d
commit b1a6255ac2
13 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/core/quickfix/QuickFixUtil.java
+1 -1
View File
@@ -142,7 +142,7 @@ public class QuickFixUtil {
return returnedElement instanceof KtExpression && canEvaluateTo((KtExpression) returnedElement, expression);
}
else {
if (functionOrGetter instanceof KtWithExpressionInitializer && canEvaluateTo(((KtWithExpressionInitializer) functionOrGetter).getInitializer(), expression)) {
if (functionOrGetter instanceof KtDeclarationWithInitializer && canEvaluateTo(((KtDeclarationWithInitializer) functionOrGetter).getInitializer(), expression)) {
return true;
}
KtReturnExpression returnExpression = PsiTreeUtil.getParentOfType(expression, KtReturnExpression.class);
idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+3 -3
View File
@@ -541,8 +541,8 @@ class KotlinPsiUnifier(
is KtDeclarationWithBody ->
doUnify(decl1.bodyExpression, (decl2 as KtDeclarationWithBody).bodyExpression)
is KtWithExpressionInitializer ->
doUnify(decl1.initializer, (decl2 as KtWithExpressionInitializer).initializer)
is KtDeclarationWithInitializer ->
doUnify(decl1.initializer, (decl2 as KtDeclarationWithInitializer).initializer)
is KtParameter ->
doUnify(decl1.defaultValue, (decl2 as KtParameter).defaultValue)
@@ -689,7 +689,7 @@ class KotlinPsiUnifier(
declarationPatternsToTargets.putValue(desc1, desc2)
val status = when (decl1) {
is KtDeclarationWithBody, is KtWithExpressionInitializer, is KtParameter ->
is KtDeclarationWithBody, is KtDeclarationWithInitializer, is KtParameter ->
matchCallables(decl1, decl2, desc1 as CallableDescriptor, desc2 as CallableDescriptor)
is KtClassOrObject ->