From b1a6255ac227422aecd97324ab18ce7d6abcc827 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 5 Sep 2016 17:47:35 +0300 Subject: [PATCH] Renamed class --- ...onInitializer.java => KtDeclarationWithInitializer.java} | 2 +- .../src/org/jetbrains/kotlin/psi/KtNamedFunction.java | 2 +- .../src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java | 2 +- .../src/org/jetbrains/kotlin/psi/KtVariableDeclaration.java | 2 +- .../jetbrains/kotlin/idea/core/quickfix/QuickFixUtil.java | 2 +- .../idea/util/psi/patternMatching/KotlinPsiUnifier.kt | 6 +++--- .../idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt | 2 +- .../jetbrains/kotlin/idea/completion/KeywordCompletion.kt | 2 +- .../src/org/jetbrains/kotlin/idea/core/generateUtil.kt | 2 +- .../idea/liveTemplates/macro/SuggestVariableNameMacro.kt | 4 ++-- .../idea/highlighter/markers/OverridenPropertyMarker.kt | 2 +- .../kotlin/idea/intentions/RemoveExplicitTypeIntention.kt | 2 +- .../idea/intentions/SpecifyTypeExplicitlyIntention.kt | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename compiler/frontend/src/org/jetbrains/kotlin/psi/{KtWithExpressionInitializer.java => KtDeclarationWithInitializer.java} (91%) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtWithExpressionInitializer.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtDeclarationWithInitializer.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/kotlin/psi/KtWithExpressionInitializer.java rename to compiler/frontend/src/org/jetbrains/kotlin/psi/KtDeclarationWithInitializer.java index 007dcc34d37..86fe92a724f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtWithExpressionInitializer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtDeclarationWithInitializer.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.Nullable; -public interface KtWithExpressionInitializer extends KtDeclaration { +public interface KtDeclarationWithInitializer extends KtDeclaration { @Nullable KtExpression getInitializer(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java index 385f30bb88c..ac248ad93c6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; public class KtNamedFunction extends KtTypeParameterListOwnerStub - implements KtFunction, KtWithExpressionInitializer, PsiModifiableCodeBlock { + implements KtFunction, KtDeclarationWithInitializer, PsiModifiableCodeBlock { public KtNamedFunction(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java index 7f01b3c4f22..a0e9b8675bc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.List; public class KtPropertyAccessor extends KtDeclarationStub - implements KtDeclarationWithBody, KtModifierListOwner, KtWithExpressionInitializer { + implements KtDeclarationWithBody, KtModifierListOwner, KtDeclarationWithInitializer { public KtPropertyAccessor(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVariableDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVariableDeclaration.java index 2a3c060ac66..e9d1fa04698 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVariableDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtVariableDeclaration.java @@ -16,6 +16,6 @@ package org.jetbrains.kotlin.psi; -public interface KtVariableDeclaration extends KtCallableDeclaration, KtWithExpressionInitializer, KtValVarKeywordOwner { +public interface KtVariableDeclaration extends KtCallableDeclaration, KtDeclarationWithInitializer, KtValVarKeywordOwner { boolean isVar(); } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/core/quickfix/QuickFixUtil.java b/idea/ide-common/src/org/jetbrains/kotlin/idea/core/quickfix/QuickFixUtil.java index 572309c1e49..f44993bfc0a 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/core/quickfix/QuickFixUtil.java +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/core/quickfix/QuickFixUtil.java @@ -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); diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt index d1b96df69b5..f185aac3736 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt @@ -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 -> diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt index d18f2a6c0be..ad066bf1994 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt @@ -532,7 +532,7 @@ class ExpressionsOfTypeProcessor( break@ParentsLoop } - is KtWithExpressionInitializer -> { // "val x = " or "fun f() = " + is KtDeclarationWithInitializer -> { // "val x = " or "fun f() = " if (element == parent.initializer) { processSuspiciousDeclaration(parent) } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt index fdaa21d31e7..b2e82e349da 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt @@ -212,7 +212,7 @@ object KeywordCompletion { } } - is KtWithExpressionInitializer -> { + is KtDeclarationWithInitializer -> { val initializer = parent.initializer if (prevParent == initializer) { return buildFilterWithContext("val v = ", initializer!!, position) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt index 4bb7a4966f3..eee40676113 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt @@ -70,7 +70,7 @@ private fun moveCaretIntoGeneratedElementDocumentUnblocked(editor: Editor, eleme } } - if (element is KtWithExpressionInitializer && element.hasInitializer()) { + if (element is KtDeclarationWithInitializer && element.hasInitializer()) { val expression = element.initializer if (expression == null) throw AssertionError() diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt index fae6cc4b7ab..3f2c54aa00b 100644 --- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt +++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.util.getResolutionScope import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtForExpression -import org.jetbrains.kotlin.psi.KtWithExpressionInitializer +import org.jetbrains.kotlin.psi.KtDeclarationWithInitializer import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode class SuggestVariableNameMacro : Macro() { @@ -60,7 +60,7 @@ class SuggestVariableNameMacro : Macro() { val nameValidator: (String) -> Boolean = { true } - val initializer = (declaration as? KtWithExpressionInitializer)?.initializer + val initializer = (declaration as? KtDeclarationWithInitializer)?.initializer if (initializer != null) { val bindingContext = initializer.analyze(BodyResolveMode.PARTIAL) return KotlinNameSuggester.suggestNamesByExpressionAndType(initializer, null, bindingContext, nameValidator, null) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt index 72c09031224..99cfec34ed9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt @@ -123,6 +123,6 @@ fun isImplemented(declaration: KtNamedDeclaration): Boolean { if (parent !is KtClass) return false - return parent.isInterface() && (declaration !is KtDeclarationWithBody || !declaration.hasBody()) && (declaration !is KtWithExpressionInitializer || !declaration.hasInitializer()) + return parent.isInterface() && (declaration !is KtDeclarationWithBody || !declaration.hasBody()) && (declaration !is KtDeclarationWithInitializer || !declaration.hasInitializer()) } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt index 698853bee0f..37a7a547d47 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt @@ -51,7 +51,7 @@ class RemoveExplicitTypeIntention : SelfTargetingRangeIntention