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

isBackingFieldReference moved to JetPsiUtil

Browse Source
This commit is contained in:
Svetlana Isakova
2012-12-18 16:40:53 +04:00
parent 67d0d8b1a9
commit a85519c3db
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/reference/BackingFieldAccessTranslator.java
+2 -2
View File
@@ -20,11 +20,11 @@ import com.google.dart.compiler.backend.js.ast.JsExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.k2js.translate.context.TemporaryVariable;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
import org.jetbrains.k2js.translate.utils.PsiUtils;
import java.util.Collections;
import java.util.List;
@@ -44,7 +44,7 @@ public final class BackingFieldAccessTranslator extends AbstractTranslator imple
/*package*/
static BackingFieldAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression,
@NotNull TranslationContext context) {
assert PsiUtils.isBackingFieldReference(expression);
assert JetPsiUtil.isBackingFieldReference(expression);
DeclarationDescriptor referencedProperty = getDescriptorForReferenceExpression(context.bindingContext(), expression);
assert referencedProperty instanceof PropertyDescriptor;
return new BackingFieldAccessTranslator((PropertyDescriptor) referencedProperty, context);
js/js.translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
+1 -1
View File
@@ -32,7 +32,7 @@ import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.isNativeObject
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCallForProperty;
import static org.jetbrains.k2js.translate.utils.PsiUtils.getSelectorAsSimpleName;
import static org.jetbrains.k2js.translate.utils.PsiUtils.isBackingFieldReference;
import static org.jetbrains.jet.lang.psi.JetPsiUtil.isBackingFieldReference;
/**
* @author Pavel Talanov
js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.k2js.translate.context.TranslationContext;
import static org.jetbrains.k2js.translate.utils.PsiUtils.isBackingFieldReference;
import static org.jetbrains.jet.lang.psi.JetPsiUtil.isBackingFieldReference;
/**
* @author Pavel Talanov
js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
-4
View File
@@ -81,10 +81,6 @@ public final class PsiUtils {
return (token == JetTokens.EQ);
}
public static boolean isBackingFieldReference(@NotNull JetSimpleNameExpression expression) {
return expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER;
}
public static boolean isInOrNotInOperation(@NotNull JetBinaryExpression binaryExpression) {
return isInOperation(binaryExpression) || isNotInOperation(binaryExpression);
}