Support TypeQualifierNickname for nullability annotations

#KT-10942 In Progress
2017-06-13 19:37:29 +03:00
parent f2a55d590c
commit 92f9194112
9 changed files with 167 additions and 29 deletions
@@ -58,14 +58,15 @@ class RuntimeModuleData private constructor(
            val runtimePackagePartProvider = RuntimePackagePartProvider(classLoader)
            val javaResolverCache = JavaResolverCache.EMPTY
            val notFoundClasses = NotFoundClasses(storageManager, module)
+            val annotationTypeQualifierResolver = AnnotationTypeQualifierResolver(storageManager)
            val globalJavaResolverContext = JavaResolverComponents(
                    storageManager, ReflectJavaClassFinder(classLoader), reflectKotlinClassFinder, deserializedDescriptorResolver,
                    ExternalAnnotationResolver.EMPTY, SignaturePropagator.DO_NOTHING, RuntimeErrorReporter, javaResolverCache,
                    JavaPropertyInitializerEvaluator.DoNothing, SamConversionResolver, RuntimeSourceElementFactory, singleModuleClassResolver,
                    runtimePackagePartProvider, SupertypeLoopChecker.EMPTY, LookupTracker.DO_NOTHING, module,
                    ReflectionTypes(module, notFoundClasses),
-                    AnnotationTypeQualifierResolver(storageManager),
-                    SignatureEnhancement()
+                    annotationTypeQualifierResolver,
+                    SignatureEnhancement(annotationTypeQualifierResolver)
            )

            val lazyJavaPackageFragmentProvider = LazyJavaPackageFragmentProvider(globalJavaResolverContext)