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

Introduce JetParameter#hasValOrVarNode() and use it instead of getValOrVarNode()

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-07 17:48:49 +04:00
parent 26452c845c
commit 9aa5681d80
22 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend-common/src/org/jetbrains/jet/backend/common/DataClassMethodGenerator.java
+1 -1
View File
@@ -123,7 +123,7 @@ public abstract class DataClassMethodGenerator {
private List<PropertyDescriptor> getDataProperties() {
List<PropertyDescriptor> result = Lists.newArrayList();
for (JetParameter parameter : getPrimaryConstructorParameters()) {
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
result.add(bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter));
}
}
compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
+1 -1
View File
@@ -110,7 +110,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
private void generatePrimaryConstructorProperties(PropertyCodegen propertyCodegen, JetClassOrObject origin) {
boolean isAnnotation = origin instanceof JetClass && ((JetClass) origin).isAnnotation();
for (JetParameter p : getPrimaryConstructorParameters()) {
if (p.getValOrVarNode() != null) {
if (p.hasValOrVarNode()) {
PropertyDescriptor propertyDescriptor = state.getBindingContext().get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, p);
if (propertyDescriptor != null) {
if (!isAnnotation) {
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -1193,7 +1193,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
int curParam = 0;
List<JetParameter> constructorParameters = getPrimaryConstructorParameters();
for (JetParameter parameter : constructorParameters) {
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
VariableDescriptor descriptor = paramDescrs.get(curParam);
Type type = typeMapper.mapType(descriptor);
iv.load(0, classAsmType);
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+8
View File
@@ -83,6 +83,14 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
return modifierList != null && modifierList.getModifierNode(JetTokens.VARARG_KEYWORD) != null;
}
public boolean hasValOrVarNode() {
PsiJetParameterStub stub = getStub();
if (stub != null) {
return stub.hasValOrValNode();
}
return getValOrVarNode() != null;
}
@Nullable
public ASTNode getValOrVarNode() {
PsiJetParameterStub stub = getStub();
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+1 -1
View File
@@ -518,7 +518,7 @@ public class JetPsiUtil {
@Nullable
public static JetClass getClassIfParameterIsProperty(@NotNull JetParameter jetParameter) {
if (jetParameter.getValOrVarNode() != null) {
if (jetParameter.hasValOrVarNode()) {
PsiElement parent = jetParameter.getParent();
if (parent instanceof JetParameterList && parent.getParent() instanceof JetClass) {
return (JetClass) parent.getParent();
compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
+1 -1
View File
@@ -85,7 +85,7 @@ public fun PsiElement.getParentByTypeAndBranch<T: PsiElement>(
public fun JetClassOrObject.effectiveDeclarations(): List<JetDeclaration> =
when(this) {
is JetClass ->
getDeclarations() + getPrimaryConstructorParameters().filter { p -> p.getValOrVarNode() != null }
getDeclarations() + getPrimaryConstructorParameters().filter { p -> p.hasValOrVarNode() }
else ->
getDeclarations()
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
@Override
public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
psi.isMutable(), psi.isVarArg(), psi.getValOrVarNode() != null,
psi.isMutable(), psi.isVarArg(), psi.hasValOrVarNode(),
psi.getDefaultValue() != null);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+1 -1
View File
@@ -162,7 +162,7 @@ public interface BindingContext {
PsiElement declarationPsiElement = map.get(BindingContextUtils.DESCRIPTOR_TO_DECLARATION, propertyDescriptor);
if (declarationPsiElement instanceof JetParameter) {
JetParameter jetParameter = (JetParameter) declarationPsiElement;
return jetParameter.getValOrVarNode() != null ||
return jetParameter.hasValOrVarNode() ||
backingFieldRequired; // this part is unused because we do not allow access to constructor parameters in member bodies
}
if (propertyDescriptor.getModality() == Modality.ABSTRACT) return false;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+1 -1
View File
@@ -257,7 +257,7 @@ public class DeclarationResolver {
List<ValueParameterDescriptor> notProperties = new ArrayList<ValueParameterDescriptor>();
for (ValueParameterDescriptor valueParameterDescriptor : valueParameterDescriptors) {
JetParameter parameter = primaryConstructorParameters.get(valueParameterDescriptor.getIndex());
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePrimaryConstructorParameterToAProperty(
classDescriptor,
valueParameterDescriptor,
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+1 -1
View File
@@ -318,7 +318,7 @@ public class DeclarationsChecker {
private void checkValOnAnnotationParameter(JetClass aClass) {
for (JetParameter parameter : aClass.getPrimaryConstructorParameters()) {
if (parameter.getValOrVarNode() == null) {
if (!parameter.hasValOrVarNode()) {
trace.report(MISSING_VAL_ON_ANNOTATION_PARAMETER.on(parameter));
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+1 -1
View File
@@ -1438,7 +1438,7 @@ public class DescriptorResolver {
@NotNull JetParameter parameter
) {
// If is not a property, then it must have no modifier
if (parameter.getValOrVarNode() == null) {
if (!parameter.hasValOrVarNode()) {
checkParameterHasNoModifier(trace, parameter);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class LazyTopDownAnalyzer {
private void registerPrimaryConstructorParameters(@NotNull JetClass klass) {
for (JetParameter jetParameter : klass.getPrimaryConstructorParameters()) {
if (jetParameter.getValOrVarNode() != null) {
if (jetParameter.hasValOrVarNode()) {
c.getPrimaryConstructorParameterProperties().put(
jetParameter,
(PropertyDescriptor) resolveSession.resolveToDescriptor(jetParameter)
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+1 -1
View File
@@ -407,7 +407,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
JetClass jetClass = (JetClass) grandFather;
// This is a primary constructor parameter
ClassDescriptor classDescriptor = getClassDescriptor(jetClass);
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
classDescriptor.getDefaultType().getMemberScope().getProperties(safeNameForLazyResolve(parameter));
return getBindingContext().get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class PsiBasedClassMemberDeclarationProvider extends AbstractPsiBasedDecl
}
for (JetParameter parameter : classInfo.getPrimaryConstructorParameters()) {
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
index.putToIndex(parameter);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+1 -1
View File
@@ -282,7 +282,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, primaryConstructor, RedeclarationHandler.DO_NOTHING, "Scope with constructor parameters in " + getName());
for (int i = 0; i < originalClassInfo.getPrimaryConstructorParameters().size(); i++) {
JetParameter jetParameter = originalClassInfo.getPrimaryConstructorParameters().get(i);
if (jetParameter.getValOrVarNode() == null) {
if (!jetParameter.hasValOrVarNode()) {
scope.addVariableDescriptor(primaryConstructor.getValueParameters().get(i));
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java
+1 -1
View File
@@ -248,7 +248,7 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
if (!name.equals(valueParameterDescriptor.getName())) continue;
JetParameter parameter = primaryConstructorParameters.get(valueParameterDescriptor.getIndex());
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
PropertyDescriptor propertyDescriptor =
resolveSession.getDescriptorResolver().resolvePrimaryConstructorParameterToAProperty(
thisDescriptor,
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class JetSourceNavigationHelper {
// property constructor parameters
List<JetParameter> constructorParameters = containingClass.getPrimaryConstructorParameters();
for (JetParameter constructorParameter : constructorParameters) {
if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.getValOrVarNode() != null) {
if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.hasValOrVarNode()) {
return constructorParameter;
}
}
idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
else if (element instanceof KotlinLightMethod) {
JetDeclaration declaration = ((KotlinLightMethod) element).getOrigin();
if (declaration instanceof JetProperty
|| (declaration instanceof JetParameter && ((JetParameter) declaration).getValOrVarNode() != null)) {
|| (declaration instanceof JetParameter && ((JetParameter) declaration).hasValOrVarNode())) {
searchNamedElement(queryParameters, (PsiNamedElement) declaration);
}
else if (declaration instanceof JetPropertyAccessor) {
idea/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt
+1 -1
View File
@@ -61,7 +61,7 @@ fun JetNamedDeclaration.namesWithAccessors(readable: Boolean = true, writable: B
is JetProperty ->
return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
is JetParameter ->
if (getValOrVarNode() != null) {
if (hasValOrVarNode()) {
return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
}
}
idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
+1 -1
View File
@@ -139,7 +139,7 @@ fun PsiReference.isUsageInContainingDeclaration(declaration: JetNamedDeclaration
fun PsiReference.isCallableOverrideUsage(declaration: JetNamedDeclaration): Boolean {
val decl2Desc = {(declaration: JetDeclaration) ->
if (declaration is JetParameter && declaration.getValOrVarNode() != null) declaration.propertyDescriptor else declaration.descriptor
if (declaration is JetParameter && declaration.hasValOrVarNode()) declaration.propertyDescriptor else declaration.descriptor
}
return checkUsageVsOriginalDescriptor(declaration, decl2Desc) { (usageDescriptor, targetDescriptor) ->
idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
JetClass jetClass = (JetClass) myElement;
List<JetDeclaration> declarations = new ArrayList<JetDeclaration>();
for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
declarations.add(parameter);
}
}
js/js.translator/src/org/jetbrains/k2js/translate/declaration/JsDataClassGenerator.java
+1 -1
View File
@@ -63,7 +63,7 @@ class JsDataClassGenerator extends DataClassMethodGenerator {
JsExpression argumentValue;
JsExpression parameterValue = new JsNameRef(paramName);
if (constructorParam.getValOrVarNode() == null) {
if (!constructorParam.hasValOrVarNode()) {
assert !function.getValueParameters().get(i).hasDefaultValue();
// Caller cannot rely on default value and pass undefined here.
argumentValue = parameterValue;