Minor: rename
This commit is contained in:
@@ -27,6 +27,6 @@ public class JetBlockCodeFragment(
|
||||
context: PsiElement?
|
||||
) : JetCodeFragment(project, name, text, JetNodeTypes.BLOCK_CODE_FRAGMENT, context) {
|
||||
|
||||
override fun getSignificantElement() = findChildByClass(javaClass<JetBlockExpression>())
|
||||
override fun getContentElement() = findChildByClass(javaClass<JetBlockExpression>())
|
||||
?: throw IllegalStateException("Block expression should be parsed for BlockCodeFragment")
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -30,5 +30,5 @@ public class JetExpressionCodeFragment(
|
||||
context: PsiElement?
|
||||
) : JetCodeFragment(project, name, text, JetNodeTypes.EXPRESSION_CODE_FRAGMENT, context) {
|
||||
|
||||
override fun getSignificantElement() = findChildByClass(javaClass<JetExpression>())
|
||||
override fun getContentElement() = findChildByClass(javaClass<JetExpression>())
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user