Get rid of underscores in private property names

They were used to workaround duplicate signature errors, but this is no longer
relevant since no accessors are generated for private properties with backing
fields
This commit is contained in:
Alexander Udalov
2014-11-11 15:25:08 +03:00
parent bb96a8e1fb
commit eb96b97bc8
15 changed files with 130 additions and 132 deletions
@@ -94,7 +94,7 @@ public class IncrementalPackageFragmentProvider(
public val moduleId: String
get() = this@IncrementalPackageFragmentProvider.moduleId
val _memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
val memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
if (fqName !in fqNamesToLoad) {
JetScope.Empty
}
@@ -109,16 +109,14 @@ public class IncrementalPackageFragmentProvider(
}
}
override fun getMemberScope(): JetScope {
return _memberScope()
}
override fun getMemberScope(): JetScope = memberScope()
private inner class IncrementalPackageScope(val packageData: PackageData) : DeserializedPackageMemberScope(
this@IncrementalPackageFragment,
packageData.getPackageProto(),
deserializationContext.withNameResolver(packageData.getNameResolver()),
{ listOf() }) {
{ listOf() }
) {
override fun filteredMemberProtos(allMemberProtos: Collection<ProtoBuf.Callable>): Collection<ProtoBuf.Callable> {
return allMemberProtos
.filter {