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

Adjust project code to changes in properties loading

Browse Source
This commit is contained in:
Denis Zharkov
2015-10-10 12:29:09 +03:00
parent 97ed8c83a0
commit f9c7e7add4
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/LazyResolveBasedCache.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.BindingContextUtils
public class LazyResolveBasedCache(private val resolveSession: ResolveSession) : JavaResolverCache {
private val trace: BindingTrace get() = resolveSession.getTrace()
private val trace: BindingTrace get() = resolveSession.trace
override fun getClassResolvedFromSource(fqName: FqName): ClassDescriptor? {
return trace.get(FQNAME_TO_CLASS_DESCRIPTOR, fqName.toUnsafe()) ?: findInPackageFragments(fqName)
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt
+1 -1
View File
@@ -28,7 +28,7 @@ public class LazyPackageMemberScope(
private val resolveSession: ResolveSession,
declarationProvider: PackageMemberDeclarationProvider,
thisPackage: PackageFragmentDescriptor)
: AbstractLazyMemberScope<PackageFragmentDescriptor, PackageMemberDeclarationProvider>(resolveSession, declarationProvider, thisPackage, resolveSession.getTrace()) {
: AbstractLazyMemberScope<PackageFragmentDescriptor, PackageMemberDeclarationProvider>(resolveSession, declarationProvider, thisPackage, resolveSession.trace) {
override fun getDescriptors(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
return computeDescriptorsFromDeclaredElements(kindFilter, nameFilter, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS)
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt
+1 -1
View File
@@ -38,7 +38,7 @@ public class LazyScriptClassMemberScope protected constructor(
trace: BindingTrace)
: LazyClassMemberScope(resolveSession, declarationProvider, thisClass, trace) {
private val scriptResultProperty: NotNullLazyValue<PropertyDescriptor> = resolveSession.getStorageManager().createLazyValue {
private val scriptResultProperty: NotNullLazyValue<PropertyDescriptor> = resolveSession.storageManager.createLazyValue {
val scriptInfo = declarationProvider.getOwnerInfo() as JetScriptInfo
createScriptResultProperty(resolveSession.getScriptDescriptor(scriptInfo.script))
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt
+4 -4
View File
@@ -54,7 +54,7 @@ public class LazyScriptDescriptor(
jetScript.toSourceElement()
) {
init {
resolveSession.getTrace().record(BindingContext.SCRIPT, jetScript, this)
resolveSession.trace.record(BindingContext.SCRIPT, jetScript, this)
}
private val implicitReceiver = ReceiverParameterDescriptorImpl(this, ScriptReceiver(this))
@@ -67,7 +67,7 @@ public class LazyScriptDescriptor(
override fun getScriptResultProperty(): PropertyDescriptor = getClassDescriptor().getUnsubstitutedMemberScope().getScriptResultProperty()
private val scriptCodeDescriptor = resolveSession.getStorageManager().createLazyValue {
private val scriptCodeDescriptor = resolveSession.storageManager.createLazyValue {
val result = ScriptCodeDescriptor(this)
val file = jetScript.getContainingJetFile()
@@ -81,8 +81,8 @@ public class LazyScriptDescriptor(
false, null, SourceElement.NO_SOURCE
)
},
DeferredType.create(resolveSession.getStorageManager(), resolveSession.getTrace()) {
scriptBodyResolver.resolveScriptReturnType(jetScript, this, resolveSession.getTrace())
DeferredType.create(resolveSession.storageManager, resolveSession.trace) {
scriptBodyResolver.resolveScriptReturnType(jetScript, this, resolveSession.trace)
}
)
result
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+6 -6
View File
@@ -272,7 +272,7 @@ public class ResolveElementCache(
is JetImportList -> {
val scope = resolveSession.getFileScopeProvider().getFileScope(resolveElement.getContainingJetFile())
scope.forceResolveAllImports()
resolveSession.getTrace()
resolveSession.trace
}
is JetAnnotationEntry -> annotationAdditionalResolve(resolveSession, resolveElement)
@@ -333,7 +333,7 @@ public class ResolveElementCache(
ForceResolveUtil.forceResolveAllContents<TypeParameterDescriptor>(parameterDescriptor)
}
return resolveSession.getTrace()
return resolveSession.trace
}
private fun codeFragmentAdditionalResolve(resolveSession: ResolveSession, codeFragment: JetCodeFragment, bodyResolveMode: BodyResolveMode): BindingTrace {
@@ -364,7 +364,7 @@ public class ResolveElementCache(
}
}
return resolveSession.getTrace()
return resolveSession.trace
}
private fun doResolveAnnotations(annotations: Annotations) {
@@ -391,7 +391,7 @@ public class ResolveElementCache(
val descriptor = analyzer.resolveToDescriptor(typeParameter)
ForceResolveUtil.forceResolveAllContents(descriptor)
return resolveSession.getTrace()
return resolveSession.trace
}
private fun delegationSpecifierAdditionalResolve(resolveSession: ResolveSession, jetElement: JetElement, classOrObject: JetClassOrObject, file: JetFile): BindingTrace {
@@ -502,7 +502,7 @@ public class ResolveElementCache(
file: JetFile,
statementFilter: StatementFilter
): BodyResolver {
val globalContext = SimpleGlobalContext(resolveSession.getStorageManager(), resolveSession.getExceptionTracker())
val globalContext = SimpleGlobalContext(resolveSession.storageManager, resolveSession.getExceptionTracker())
val module = resolveSession.getModuleDescriptor()
return createContainerForBodyResolve(
globalContext.withProject(file.getProject()).withModule(module),
@@ -514,7 +514,7 @@ public class ResolveElementCache(
// All additional resolve should be done to separate trace
private fun createDelegatingTrace(resolveElement: JetElement): BindingTrace {
return resolveSession.getStorageManager().createSafeTrace(
return resolveSession.storageManager.createSafeTrace(
DelegatingBindingTrace(resolveSession.getBindingContext(), "trace to resolve element", resolveElement))
}
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
+1 -1
View File
@@ -263,7 +263,7 @@ fun JetCallExpression.getParameterInfos(): List<ParameterInfo> {
return valueArguments.map {
ParameterInfo(
it.getArgumentExpression()?.let { TypeInfo(it, Variance.IN_VARIANCE) } ?: TypeInfo(anyType, Variance.IN_VARIANCE),
it.getArgumentName()?.getReferenceExpression()?.getReferencedName()
it.getArgumentName()?.referenceExpression?.getReferencedName()
)
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateInvokeFunctionActionFactory.kt
+1 -1
View File
@@ -42,7 +42,7 @@ object CreateInvokeFunctionActionFactory : CreateCallableMemberFromUsageFactory<
val parameters = element.valueArguments.map {
ParameterInfo(
it.getArgumentExpression()?.let { TypeInfo(it, Variance.IN_VARIANCE) } ?: TypeInfo(anyType, Variance.IN_VARIANCE),
it.getArgumentName()?.getReferenceExpression()?.getReferencedName()
it.getArgumentName()?.referenceExpression?.getReferencedName()
)
}
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt
+1 -1
View File
@@ -86,7 +86,7 @@ public object CreateClassFromConstructorCallActionFactory: CreateClassFromUsageF
val parameterInfos = valueArguments.map {
ParameterInfo(
it.getArgumentExpression()?.let { TypeInfo(it, Variance.IN_VARIANCE) } ?: TypeInfo(anyType, Variance.IN_VARIANCE),
it.getArgumentName()?.getReferenceExpression()?.getReferencedName() ?: defaultParamName
it.getArgumentName()?.referenceExpression?.getReferencedName() ?: defaultParamName
)
}