Renamed class

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();
 

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<KotlinFunctionStub>
-        implements KtFunction, KtWithExpressionInitializer, PsiModifiableCodeBlock {
+        implements KtFunction, KtDeclarationWithInitializer, PsiModifiableCodeBlock {
     public KtNamedFunction(@NotNull ASTNode node) {
         super(node);
     }

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<KotlinPropertyAccessorStub>
-        implements KtDeclarationWithBody, KtModifierListOwner, KtWithExpressionInitializer {
+        implements KtDeclarationWithBody, KtModifierListOwner, KtDeclarationWithInitializer {
     public KtPropertyAccessor(@NotNull ASTNode node) {
         super(node);
     }

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();
 }

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);

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 ->

idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt

@@ -532,7 +532,7 @@ class ExpressionsOfTypeProcessor(
                     break@ParentsLoop
                 }
 
-                is KtWithExpressionInitializer -> { // "val x = <expr>" or "fun f() = <expr>"
+                is KtDeclarationWithInitializer -> { // "val x = <expr>" or "fun f() = <expr>"
                     if (element == parent.initializer) {
                         processSuspiciousDeclaration(parent)
                     }

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)

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()
 

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)

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())
 }
 

idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt

@@ -51,7 +51,7 @@ class RemoveExplicitTypeIntention : SelfTargetingRangeIntention<KtCallableDeclar
             return element.textRange
         }
 
-        val initializer = (element as? KtWithExpressionInitializer)?.initializer ?: return null
+        val initializer = (element as? KtDeclarationWithInitializer)?.initializer ?: return null
         if (element !is KtProperty && (element !is KtNamedFunction || element.hasBlockBody())) return null
 
         return TextRange(element.startOffset, initializer.startOffset - 1)

idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt

@@ -60,7 +60,7 @@ class SpecifyTypeExplicitlyIntention :
 
         text = if (element is KtFunction) "Specify return type explicitly" else "Specify type explicitly"
 
-        val initializer = (element as? KtWithExpressionInitializer)?.initializer
+        val initializer = (element as? KtDeclarationWithInitializer)?.initializer
         return if (initializer != null) {
             TextRange(element.startOffset, initializer.startOffset - 1)
         }