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

Revert "Support decapitilized obsolete annotations in resolve"

Browse Source 
This reverts commit 4159c83282.
This commit is contained in:
Denis Zharkov
2015-09-15 17:11:29 +03:00
parent 53bccec50d
commit f518348565
6 changed files with 9 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+3 -7
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.resolve.scopes.ChainedScope
import org.jetbrains.kotlin.resolve.scopes.DecapitalizedAnnotationScope
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.serialization.PackageData
import org.jetbrains.kotlin.serialization.ProtoBuf
@@ -125,12 +124,9 @@ public class IncrementalPackageFragmentProvider(
}
else {
val scopes = dataOfPackageParts.map { IncrementalPackageScope(JvmProtoBufUtil.readPackageDataFrom(it)) }
DecapitalizedAnnotationScope.wrapIfNeeded(
ChainedScope(this,
"Member scope for incremental compilation: union of package parts data",
*scopes.toTypedArray<JetScope>()
),
fqName
ChainedScope(this,
"Member scope for incremental compilation: union of package parts data",
*scopes.toTypedArray<JetScope>()
)
}
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java
+1 -3
View File
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil;
import org.jetbrains.kotlin.resolve.lazy.LazyEntity;
import org.jetbrains.kotlin.resolve.lazy.ResolveSession;
import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider;
import org.jetbrains.kotlin.resolve.scopes.DecapitalizedAnnotationScope;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
public class LazyPackageDescriptor extends PackageFragmentDescriptorImpl implements LazyEntity {
@@ -42,8 +41,7 @@ public class LazyPackageDescriptor extends PackageFragmentDescriptorImpl impleme
super(module, fqName);
this.declarationProvider = declarationProvider;
// Wrapping is just a temporary hack to inject deprecated decapitalized annotation
this.memberScope = DecapitalizedAnnotationScope.Companion.wrapIfNeeded(new LazyPackageMemberScope(resolveSession, declarationProvider, this), fqName);
this.memberScope = new LazyPackageMemberScope(resolveSession, declarationProvider, this);
for (JetFile file : declarationProvider.getPackageFiles()) {
resolveSession.getTrace().record(BindingContext.FILE_TO_PACKAGE_FRAGMENT, file, this);