Introduce interface method: VariableDescriptor.isConst
And several default implementations Also take it into account in renderer
This commit is contained in:
@@ -645,7 +645,8 @@ public class DescriptorResolver {
|
||||
JetPsiUtil.safeName(variable.getName()),
|
||||
CallableMemberDescriptor.Kind.DECLARATION,
|
||||
toSourceElement(variable),
|
||||
false
|
||||
/* lateInit = */ false,
|
||||
/* isConst = */ false
|
||||
);
|
||||
// For a local variable the type must not be deferred
|
||||
type = getVariableType(propertyDescriptor, scope, variable, dataFlowInfo, false, trace);
|
||||
@@ -743,7 +744,8 @@ public class DescriptorResolver {
|
||||
JetPsiUtil.safeName(property.getName()),
|
||||
CallableMemberDescriptor.Kind.DECLARATION,
|
||||
toSourceElement(property),
|
||||
modifierList != null && modifierList.hasModifier(JetTokens.LATE_INIT_KEYWORD)
|
||||
modifierList != null && modifierList.hasModifier(JetTokens.LATE_INIT_KEYWORD),
|
||||
modifierList != null && modifierList.hasModifier(JetTokens.CONST_KEYWORD)
|
||||
);
|
||||
wrapper.setProperty(propertyDescriptor);
|
||||
|
||||
@@ -1114,7 +1116,8 @@ public class DescriptorResolver {
|
||||
name,
|
||||
CallableMemberDescriptor.Kind.DECLARATION,
|
||||
toSourceElement(parameter),
|
||||
false
|
||||
/* lateInit = */ false,
|
||||
/* isConst = */ false
|
||||
);
|
||||
propertyWrapper.setProperty(propertyDescriptor);
|
||||
propertyDescriptor.setType(type, Collections.<TypeParameterDescriptor>emptyList(),
|
||||
|
||||
@@ -95,7 +95,8 @@ object DynamicCallableDescriptors {
|
||||
name,
|
||||
CallableMemberDescriptor.Kind.DECLARATION,
|
||||
SourceElement.NO_SOURCE,
|
||||
false
|
||||
/* lateInit = */ false,
|
||||
/* isConst = */ false
|
||||
)
|
||||
propertyDescriptor.setType(
|
||||
DynamicType,
|
||||
|
||||
+2
@@ -61,4 +61,6 @@ public class FakeCallableDescriptorForObject(
|
||||
override fun getCompileTimeInitializer() = null
|
||||
|
||||
override fun getSource(): SourceElement = classDescriptor.getSource()
|
||||
|
||||
override fun isConst(): Boolean = false
|
||||
}
|
||||
|
||||
+4
-2
@@ -93,7 +93,8 @@ public class LazyScriptClassMemberScope protected constructor(
|
||||
Name.identifier(ScriptDescriptor.LAST_EXPRESSION_VALUE_FIELD_NAME),
|
||||
CallableMemberDescriptor.Kind.DECLARATION,
|
||||
SourceElement.NO_SOURCE,
|
||||
false
|
||||
/* lateInit = */ false,
|
||||
/* isConst = */ false
|
||||
)
|
||||
|
||||
val returnType = scriptDescriptor.getScriptCodeDescriptor().getReturnType()
|
||||
@@ -134,7 +135,8 @@ public class LazyScriptClassMemberScope protected constructor(
|
||||
parameter.getName(),
|
||||
CallableMemberDescriptor.Kind.DECLARATION,
|
||||
SourceElement.NO_SOURCE,
|
||||
false
|
||||
/* lateInit = */ false,
|
||||
/* isConst = */ false
|
||||
)
|
||||
propertyDescriptor.setType(
|
||||
parameter.getType(),
|
||||
|
||||
Reference in New Issue
Block a user