From f942f6ac8e6bba2f4e022f32d3c7808e4058fdfe Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 8 Apr 2015 15:39:10 +0300 Subject: [PATCH] Move ReflectionTypes to builtins --- .../src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java | 2 +- .../src/org/jetbrains/kotlin/codegen/state/GenerationState.java | 2 +- .../org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java | 2 +- .../jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java | 2 +- .../kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java | 2 +- .../kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java | 2 +- .../frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java | 2 +- .../kotlin/types/expressions/ExpressionTypingComponents.java | 2 +- compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java | 2 +- .../src/org/jetbrains/kotlin/builtins}/ReflectionTypes.kt | 2 +- .../kotlin/idea/inspections/ReflectionNotFoundInspection.kt | 2 +- .../jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java | 2 +- .../jetbrains/kotlin/js/translate/context/StaticContext.java | 2 +- .../kotlin/js/translate/context/TranslationContext.java | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename {compiler/frontend/src/org/jetbrains/kotlin/types/reflect => core/descriptors/src/org/jetbrains/kotlin/builtins}/ReflectionTypes.kt (99%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index 4a83b07448b..46788642eea 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java index 6702f836377..12d623813e5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import java.io.File; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java index b202e1e382a..46ba7441d57 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -58,7 +58,7 @@ import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java index c3d08d2a0d0..1dd6044e228 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -62,7 +62,7 @@ import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java index d31bb229ef9..ff68f8b9e74 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index b3b3f432adb..6b29690a14c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 4c4aad55129..70adb81e0c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java index 7c7c5a312de..74d067647c3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index f3785c86f28..44a9d338289 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 9143cf4586c..d49e7844820 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index 6ae8aa60240..6d153d77e77 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.kotlin.types.expressions.LocalClassifierAnalyzer; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java index 482c356ad08..2f035c37490 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.types.DynamicTypesSettings; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import javax.inject.Inject; diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 5408a24dc3f..1106077fdee 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.kotlin.types.expressions.LocalClassifierAnalyzer; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/reflect/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt similarity index 99% rename from compiler/frontend/src/org/jetbrains/kotlin/types/reflect/ReflectionTypes.kt rename to core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index b7a638c804f..3fb31547a2d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/reflect/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.types.reflect +package org.jetbrains.kotlin.builtins import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt index c7733400f42..5b4f12681f3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetVisitorVoid import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies -import org.jetbrains.kotlin.types.reflect.ReflectionTypes +import org.jetbrains.kotlin.builtins.ReflectionTypes import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.singletonOrEmptyList diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index 57e7771124a..3dd6afa8576 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index e694a1cd5cf..b08a5402514 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index 4bd3d9fa4cb..8be1e6a3e23 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.types.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.ReflectionTypes; import java.util.HashMap; import java.util.Map;