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

Minor: rename

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-05-15 17:18:39 +04:00
parent fff278e1c6
commit 9785c15736
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockCodeFragment.kt
+1 -1
View File
@@ -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")
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt
+1 -1
View File
@@ -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
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionCodeFragment.kt
+1 -1
View File
@@ -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>())
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java
+2 -2
View File
@@ -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);
}
}