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

Minor. Invert 'notLocal' boolean value parameter

Browse Source 
- Mainly to avoid double negations (!notLocal)
- Also swap last parameters (to allow use of named arguments)
This commit is contained in:
Denis Zharkov
2016-11-14 18:09:59 +03:00
parent b5a6cbd188
commit 5e73dc4a4c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+1 -1
View File
@@ -816,7 +816,7 @@ public class DescriptorResolver {
LexicalScope scopeForInitializer = ScopeUtils.makeScopeForPropertyInitializer(scopeWithTypeParameters, propertyDescriptor);
KotlinType typeIfKnown = variableTypeAndInitializerResolver.resolveTypeNullable(
propertyDescriptor, scopeForInitializer,
property, dataFlowInfo, true, trace
property, dataFlowInfo, /* local = */ trace, false
);
PropertyGetterDescriptorImpl getter = resolvePropertyGetterDescriptor(
compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt
+3 -3
View File
@@ -149,10 +149,10 @@ class LocalVariableResolver(
/* isConst = */ false
)
// For a local variable the type must not be deferred
type = variableTypeAndInitializerResolver.resolveType(propertyDescriptor, scope, variable, dataFlowInfo, false, trace)
type = variableTypeAndInitializerResolver.resolveType(propertyDescriptor, scope, variable, dataFlowInfo, trace, local = true)
val receiverParameter = (containingDeclaration as ScriptDescriptor).thisAsReceiverParameter
propertyDescriptor.setType(type, emptyList<TypeParameterDescriptor>(), receiverParameter, null as? KotlinType)
propertyDescriptor.setType(type, emptyList<TypeParameterDescriptor>(), receiverParameter, null as KotlinType?)
initializeWithDefaultGetterSetter(propertyDescriptor)
trace.record(BindingContext.VARIABLE, variable, propertyDescriptor)
result = propertyDescriptor
@@ -160,7 +160,7 @@ class LocalVariableResolver(
else {
val variableDescriptor = resolveLocalVariableDescriptorWithType(scope, variable, null, trace)
// For a local variable the type must not be deferred
type = variableTypeAndInitializerResolver.resolveType(variableDescriptor, scope, variable, dataFlowInfo, false, trace)
type = variableTypeAndInitializerResolver.resolveType(variableDescriptor, scope, variable, dataFlowInfo, trace, local = true)
variableDescriptor.setOutType(type)
result = variableDescriptor
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/VariableTypeAndInitializerResolver.kt
+7 -7
View File
@@ -53,12 +53,12 @@ class VariableTypeAndInitializerResolver(
scopeForInitializer: LexicalScope,
variable: KtVariableDeclaration,
dataFlowInfo: DataFlowInfo,
notLocal: Boolean,
trace: BindingTrace
trace: BindingTrace,
local: Boolean
): KotlinType {
resolveTypeNullable(variableDescriptor, scopeForInitializer, variable, dataFlowInfo, notLocal, trace)?.let { return it }
resolveTypeNullable(variableDescriptor, scopeForInitializer, variable, dataFlowInfo, trace, local)?.let { return it }
if (!notLocal) {
if (local) {
trace.report(VARIABLE_WITH_NO_TYPE_NO_INITIALIZER.on(variable))
}
@@ -70,8 +70,8 @@ class VariableTypeAndInitializerResolver(
scopeForInitializer: LexicalScope,
variable: KtVariableDeclaration,
dataFlowInfo: DataFlowInfo,
notLocal: Boolean,
trace: BindingTrace
trace: BindingTrace,
local: Boolean
): KotlinType? {
val propertyTypeRef = variable.typeReference
return when {
@@ -82,7 +82,7 @@ class VariableTypeAndInitializerResolver(
resolveDelegatedPropertyType(variable, variableDescriptor, scopeForInitializer, dataFlowInfo, trace)
variable.hasInitializer() -> when {
notLocal ->
!local ->
DeferredType.createRecursionIntolerant(
storageManager,
trace