From 9785c15736520acb3fe28d3eb1ad1689e1fa09b9 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 15 May 2014 17:18:39 +0400 Subject: [PATCH] Minor: rename --- .../src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt | 2 +- .../src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt | 2 +- .../org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt | 2 +- .../src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java | 4 ++-- .../jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt | 2 +- .../jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt | 2 +- .../org/jetbrains/jet/plugin/project/ResolveElementCache.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt index 02ef27e2900..f47246fc78a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt @@ -27,6 +27,6 @@ public class JetBlockCodeFragment( context: PsiElement? ) : JetCodeFragment(project, name, text, JetNodeTypes.BLOCK_CODE_FRAGMENT, context) { - override fun getSignificantElement() = findChildByClass(javaClass()) + override fun getContentElement() = findChildByClass(javaClass()) ?: throw IllegalStateException("Block expression should be parsed for BlockCodeFragment") } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt index 09e06a58f33..9b8816147be 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt @@ -50,7 +50,7 @@ public abstract class JetCodeFragment( private var _superType: PsiType? = null private var _exceptionHandler: JavaCodeFragment.ExceptionHandler? = null - public abstract fun getSignificantElement(): JetElement? + public abstract fun getContentElement(): JetElement? override fun forceResolveScope(scope: GlobalSearchScope?) { _resolveScope = scope diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt index d3dabdfd2b0..858f49b18a5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt @@ -30,5 +30,5 @@ public class JetExpressionCodeFragment( context: PsiElement? ) : JetCodeFragment(project, name, text, JetNodeTypes.EXPRESSION_CODE_FRAGMENT, context) { - override fun getSignificantElement() = findChildByClass(javaClass()) + override fun getContentElement() = findChildByClass(javaClass()) } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java index 07f406ee9c1..22d0f1ff2b3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java @@ -30,7 +30,7 @@ public class JetTypeCodeFragment extends JetCodeFragment { @Nullable public JetType getType() { - JetElement typeReference = getSignificantElement(); + JetElement typeReference = getContentElement(); if (typeReference instanceof JetTypeReference) { //TODO return the actual type return KotlinBuiltIns.getInstance().getAnyType(); @@ -40,7 +40,7 @@ public class JetTypeCodeFragment extends JetCodeFragment { @Nullable @Override - public JetElement getSignificantElement() { + public JetElement getContentElement() { return findChildByClass(JetTypeReference.class); } } diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index 82fcae21458..8d5b6e2575c 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -280,7 +280,7 @@ private object KotlinResolveDataProvider { } private fun analyzeExpressionCodeFragment(resolveSession: ResolveSessionForBodies, codeFragment: JetCodeFragment): BindingContext { - val codeFragmentExpression = codeFragment.getSignificantElement() + val codeFragmentExpression = codeFragment.getContentElement() if (!(codeFragmentExpression is JetExpression)) return BindingContext.EMPTY val contextElement = codeFragment.getContext() diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt index 811ce6064d1..6f6c7defa34 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -254,7 +254,7 @@ fun addDebugExpressionBeforeContextElement(codeFragment: JetCodeFragment, contex parent.addBefore(JetPsiFactory.createNewLine(contextElement.getProject()), contextElement) - val debugExpression = codeFragment.getSignificantElement() + val debugExpression = codeFragment.getContentElement() if (debugExpression == null) return null val newDebugExpression = parent.addBefore(debugExpression, contextElement) diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index e346fd9d455..96e412feb46 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -218,7 +218,7 @@ public class ResolveElementCache { JetCodeFragment codeFragment, BindingTrace trace ) { - JetElement codeFragmentExpression = codeFragment.getSignificantElement(); + JetElement codeFragmentExpression = codeFragment.getContentElement(); if (!(codeFragmentExpression instanceof JetExpression)) return; PsiElement contextElement = codeFragment.getContext();