Introduce JetParameter#hasDefaultValue() and use it instead of getDefaultValue() where appropriate
This commit is contained in:
@@ -45,6 +45,14 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
|
|||||||
return getStubOrPsiChild(JetStubElementTypes.TYPE_REFERENCE);
|
return getStubOrPsiChild(JetStubElementTypes.TYPE_REFERENCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean hasDefaultValue() {
|
||||||
|
PsiJetParameterStub stub = getStub();
|
||||||
|
if (stub != null) {
|
||||||
|
return stub.hasDefaultValue();
|
||||||
|
}
|
||||||
|
return getDefaultValue() != null;
|
||||||
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public JetExpression getDefaultValue() {
|
public JetExpression getDefaultValue() {
|
||||||
PsiJetParameterStub stub = getStub();
|
PsiJetParameterStub stub = getStub();
|
||||||
|
|||||||
+1
-1
@@ -40,7 +40,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
|
|||||||
public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
|
public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
|
||||||
return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
|
return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
|
||||||
psi.isMutable(), psi.isVarArg(), psi.hasValOrVarNode(),
|
psi.isMutable(), psi.isVarArg(), psi.hasValOrVarNode(),
|
||||||
psi.getDefaultValue() != null);
|
psi.hasDefaultValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -556,7 +556,7 @@ public class DescriptorResolver {
|
|||||||
annotations,
|
annotations,
|
||||||
JetPsiUtil.safeName(valueParameter.getName()),
|
JetPsiUtil.safeName(valueParameter.getName()),
|
||||||
variableType,
|
variableType,
|
||||||
valueParameter.getDefaultValue() != null,
|
valueParameter.hasDefaultValue(),
|
||||||
varargElementType
|
varargElementType
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -1151,9 +1151,8 @@ public class DescriptorResolver {
|
|||||||
if (parameter != null) {
|
if (parameter != null) {
|
||||||
|
|
||||||
// This check is redundant: the parser does not allow a default value, but we'll keep it just in case
|
// This check is redundant: the parser does not allow a default value, but we'll keep it just in case
|
||||||
JetExpression defaultValue = parameter.getDefaultValue();
|
if (parameter.hasDefaultValue()) {
|
||||||
if (defaultValue != null) {
|
trace.report(SETTER_PARAMETER_WITH_DEFAULT_VALUE.on(parameter.getDefaultValue()));
|
||||||
trace.report(SETTER_PARAMETER_WITH_DEFAULT_VALUE.on(defaultValue));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
JetType type;
|
JetType type;
|
||||||
|
|||||||
Reference in New Issue
Block a user