From 6caaf6ecfbc27c8584dd47f4a8f23876c5065ac2 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 10 May 2011 15:40:38 +0400 Subject: [PATCH] Code regrouped --- .../jetbrains/jet/codegen/ClassCodegen.java | 1 + .../org/jetbrains/jet/codegen/Codegens.java | 2 +- .../jet/codegen/ExpressionCodegen.java | 1 + .../org/jetbrains/jet/codegen/FrameMap.java | 3 +- .../jet/codegen/FunctionCodegen.java | 2 ++ .../jetbrains/jet/codegen/JetTypeMapper.java | 1 + .../jet/codegen/NamespaceCodegen.java | 2 +- .../jet/codegen/PropertyCodegen.java | 4 +++ .../org/jetbrains/jet/lang/ErrorHandler.java | 2 +- .../org/jetbrains/jet/lang/JetDiagnostic.java | 2 +- .../annotations/JetLineMarkerProvider.java | 2 +- .../jet/lang/annotations/JetPsiChecker.java | 6 ++-- .../jet/lang/cfg/JetControlFlowProcessor.java | 2 +- .../{types => descriptors}/Annotated.java | 2 +- .../{types => descriptors}/AnnotatedImpl.java | 2 +- .../{types => descriptors}/Annotation.java | 2 +- .../ClassDescriptor.java | 5 +++- .../ClassDescriptorImpl.java | 3 +- .../ClassifierDescriptor.java | 4 ++- .../ConstructorDescriptor.java | 3 +- .../ConstructorDescriptorImpl.java | 4 +-- .../DeclarationDescriptor.java | 3 +- .../DeclarationDescriptorImpl.java | 2 +- .../DeclarationDescriptorVisitor.java | 2 +- .../ExtensionDescriptor.java | 2 +- .../FunctionDescriptor.java | 4 ++- .../FunctionDescriptorImpl.java | 4 ++- .../FunctionDescriptorUtil.java | 4 ++- .../{types => descriptors}/FunctionGroup.java | 3 +- .../LazySubstitutingClassDescriptor.java | 4 ++- .../LazySubstitutingFunctionGroup.java | 4 ++- .../LocalVariableDescriptor.java | 4 ++- .../MemberDescriptor.java | 2 +- .../MemberModifiers.java | 2 +- .../ModuleDescriptor.java | 3 +- .../MutableClassDescriptor.java | 3 +- .../MutableDeclarationDescriptor.java | 5 +--- .../MutableFunctionDescriptor.java | 3 +- .../MutableValueParameterDescriptor.java | 3 +- .../lang/{types => descriptors}/Named.java | 2 +- .../NamespaceDescriptor.java | 4 ++- .../PropertyAccessorDescriptor.java | 3 +- .../PropertyDescriptor.java | 5 +++- .../PropertyGetterDescriptor.java | 3 +- .../PropertySetterDescriptor.java | 4 ++- .../TypeParameterDescriptor.java | 3 +- .../ValueParameterDescriptor.java | 3 +- .../ValueParameterDescriptorImpl.java | 4 ++- .../VariableDescriptor.java | 4 ++- .../VariableDescriptorImpl.java | 3 +- .../WritableFunctionGroup.java | 3 +- .../jet/lang/resolve/AnalyzingUtils.java | 2 +- .../jet/lang/resolve/AnnotationResolver.java | 2 +- .../jet/lang/resolve/BindingContext.java | 1 + .../lang/{types => resolve}/BindingTrace.java | 6 ++-- .../BindingTraceAdapter.java | 6 ++-- .../jet/lang/resolve/BindingTraceContext.java | 1 + .../lang/resolve/ClassDescriptorResolver.java | 1 + .../jetbrains/jet/lang/resolve/JetScope.java | 1 + .../jet/lang/resolve/JetScopeAdapter.java | 1 + .../jet/lang/resolve/JetScopeImpl.java | 1 + .../resolve/OverloadResolutionResult.java | 2 +- .../jet/lang/resolve/OverloadResolver.java | 3 ++ .../jet/lang/resolve/ScopeWithReceiver.java | 1 + .../jet/lang/resolve/SubstitutingScope.java | 1 + .../jet/lang/resolve/TopDownAnalyzer.java | 29 ++++++++++++++++++- .../jet/lang/resolve/TypeResolver.java | 1 + .../jet/lang/resolve/WritableScope.java | 1 + .../jet/lang/resolve/WritableScopeImpl.java | 1 + .../resolve/WritableScopeWithImports.java | 8 ++--- .../jet/lang/resolve/WriteThroughScope.java | 1 + .../resolve/java/JavaClassMembersScope.java | 1 + .../resolve/java/JavaDescriptorResolver.java | 5 ++-- .../lang/resolve/java/JavaPackageScope.java | 6 ++-- .../resolve/java/JavaSemanticServices.java | 2 +- .../resolve/java/JavaTypeTransformer.java | 3 ++ .../jetbrains/jet/lang/types/ErrorUtils.java | 1 + .../jet/lang/types/JetStandardClasses.java | 1 + .../jet/lang/types/JetStandardLibrary.java | 2 ++ .../org/jetbrains/jet/lang/types/JetType.java | 1 + .../jet/lang/types/JetTypeChecker.java | 2 ++ .../jetbrains/jet/lang/types/JetTypeImpl.java | 3 ++ .../jet/lang/types/JetTypeInferrer.java | 1 + .../jet/lang/types/NamespaceType.java | 1 + .../jet/lang/types/TypeConstructor.java | 3 ++ .../jet/lang/types/TypeConstructorImpl.java | 4 +++ .../jet/lang/types/TypeSubstitutor.java | 1 + .../jetbrains/jet/lang/types/TypeUtils.java | 3 ++ .../types/nullability/NullabilityDomain.java | 8 ----- .../plugin/JetQuickDocumentationProvider.java | 2 +- .../jetbrains/jet/resolve/DescriptorUtil.java | 1 + .../jet/resolve/ExpectedResolveData.java | 4 +++ .../jetbrains/jet/resolve/JetResolveTest.java | 1 + .../jet/types/JetOverridingTest.java | 4 +++ .../jet/types/JetTypeCheckerTest.java | 1 + 95 files changed, 204 insertions(+), 80 deletions(-) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/Annotated.java (73%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/AnnotatedImpl.java (89%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/Annotation.java (58%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ClassDescriptor.java (80%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ClassDescriptorImpl.java (97%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ClassifierDescriptor.java (63%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ConstructorDescriptor.java (89%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ConstructorDescriptorImpl.java (96%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/DeclarationDescriptor.java (90%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/DeclarationDescriptorImpl.java (96%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/DeclarationDescriptorVisitor.java (98%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ExtensionDescriptor.java (60%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/FunctionDescriptor.java (82%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/FunctionDescriptorImpl.java (96%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/FunctionDescriptorUtil.java (98%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/FunctionGroup.java (93%) rename idea/src/org/jetbrains/jet/lang/{resolve => descriptors}/LazySubstitutingClassDescriptor.java (94%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/LazySubstitutingFunctionGroup.java (94%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/LocalVariableDescriptor.java (86%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/MemberDescriptor.java (78%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/MemberModifiers.java (93%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ModuleDescriptor.java (85%) rename idea/src/org/jetbrains/jet/lang/{resolve => descriptors}/MutableClassDescriptor.java (98%) rename idea/src/org/jetbrains/jet/lang/{resolve => descriptors}/MutableDeclarationDescriptor.java (83%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/MutableFunctionDescriptor.java (72%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/MutableValueParameterDescriptor.java (69%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/Named.java (75%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/NamespaceDescriptor.java (89%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/PropertyAccessorDescriptor.java (91%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/PropertyDescriptor.java (93%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/PropertyGetterDescriptor.java (95%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/PropertySetterDescriptor.java (93%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/TypeParameterDescriptor.java (97%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ValueParameterDescriptor.java (83%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/ValueParameterDescriptorImpl.java (95%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/VariableDescriptor.java (84%) rename idea/src/org/jetbrains/jet/lang/{types => descriptors}/VariableDescriptorImpl.java (92%) rename idea/src/org/jetbrains/jet/lang/{resolve => descriptors}/WritableFunctionGroup.java (96%) rename idea/src/org/jetbrains/jet/lang/{types => resolve}/BindingTrace.java (93%) rename idea/src/org/jetbrains/jet/lang/{types => resolve}/BindingTraceAdapter.java (92%) delete mode 100644 idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java diff --git a/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java b/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java index d4221c3c571..7242197181a 100644 --- a/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java @@ -3,6 +3,7 @@ package org.jetbrains.jet.codegen; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/codegen/Codegens.java b/idea/src/org/jetbrains/jet/codegen/Codegens.java index 9e4aa814bd7..af2df41fd4e 100644 --- a/idea/src/org/jetbrains/jet/codegen/Codegens.java +++ b/idea/src/org/jetbrains/jet/codegen/Codegens.java @@ -1,9 +1,9 @@ package org.jetbrains.jet.codegen; import com.intellij.openapi.project.Project; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.psi.JetNamespace; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.ClassDescriptor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.util.TraceClassVisitor; diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 53549478c0e..659052dcfd2 100644 --- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -7,6 +7,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import jet.IntRange; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/codegen/FrameMap.java b/idea/src/org/jetbrains/jet/codegen/FrameMap.java index 827ab5f1367..444e2e41cef 100644 --- a/idea/src/org/jetbrains/jet/codegen/FrameMap.java +++ b/idea/src/org/jetbrains/jet/codegen/FrameMap.java @@ -1,8 +1,7 @@ package org.jetbrains.jet.codegen; import gnu.trove.TObjectIntHashMap; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; -import org.objectweb.asm.Type; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; /** * @author max diff --git a/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 3d23b16fd1b..74eba882f04 100644 --- a/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -1,5 +1,7 @@ package org.jetbrains.jet.codegen; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java index a0e910bf3bf..c7cb69c4c82 100644 --- a/idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java +++ b/idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.codegen; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/idea/src/org/jetbrains/jet/codegen/NamespaceCodegen.java index d2d0539ff04..e1a8c1fcb22 100644 --- a/idea/src/org/jetbrains/jet/codegen/NamespaceCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/NamespaceCodegen.java @@ -3,11 +3,11 @@ package org.jetbrains.jet.codegen; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.ErrorHandler; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetStandardLibrary; -import org.jetbrains.jet.lang.types.PropertyDescriptor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/idea/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/idea/src/org/jetbrains/jet/codegen/PropertyCodegen.java index 06c2b490908..3efba079165 100644 --- a/idea/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -1,6 +1,10 @@ package org.jetbrains.jet.codegen; import com.intellij.openapi.util.text.StringUtil; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor; +import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/lang/ErrorHandler.java b/idea/src/org/jetbrains/jet/lang/ErrorHandler.java index ef64fa6c773..e34a917e9ad 100644 --- a/idea/src/org/jetbrains/jet/lang/ErrorHandler.java +++ b/idea/src/org/jetbrains/jet/lang/ErrorHandler.java @@ -2,9 +2,9 @@ package org.jetbrains.jet.lang; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; import org.jetbrains.jet.lang.types.JetType; /** diff --git a/idea/src/org/jetbrains/jet/lang/JetDiagnostic.java b/idea/src/org/jetbrains/jet/lang/JetDiagnostic.java index 6d3ffacef6c..06c66de5699 100644 --- a/idea/src/org/jetbrains/jet/lang/JetDiagnostic.java +++ b/idea/src/org/jetbrains/jet/lang/JetDiagnostic.java @@ -2,9 +2,9 @@ package org.jetbrains.jet.lang; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NonNls; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; import org.jetbrains.jet.lang.types.JetType; /** diff --git a/idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java index a94bb52b90e..0dd74792faa 100644 --- a/idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java @@ -17,11 +17,11 @@ import com.intellij.psi.util.PsiUtilBase; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Function; import com.intellij.util.PsiNavigateUtil; +import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFunction; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.FunctionDescriptor; import org.jetbrains.jet.resolve.DescriptorUtil; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java b/idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java index f316399090d..cf390aaa4f8 100644 --- a/idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java +++ b/idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java @@ -17,10 +17,10 @@ import org.jetbrains.jet.lang.JetHighlighter; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.PropertyDescriptor; -import org.jetbrains.jet.lang.types.VariableDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import java.util.HashSet; import java.util.Set; diff --git a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 94317a04833..6e52be0a950 100644 --- a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.types.BindingTrace; +import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.types.JetTypeInferrer; import org.jetbrains.jet.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/lang/types/Annotated.java b/idea/src/org/jetbrains/jet/lang/descriptors/Annotated.java similarity index 73% rename from idea/src/org/jetbrains/jet/lang/types/Annotated.java rename to idea/src/org/jetbrains/jet/lang/descriptors/Annotated.java index 5d7aef15d40..c956ec791c5 100644 --- a/idea/src/org/jetbrains/jet/lang/types/Annotated.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/Annotated.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/AnnotatedImpl.java similarity index 89% rename from idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/AnnotatedImpl.java index 1527a1a9c23..2cbe63b1e0d 100644 --- a/idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/AnnotatedImpl.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/Annotation.java b/idea/src/org/jetbrains/jet/lang/descriptors/Annotation.java similarity index 58% rename from idea/src/org/jetbrains/jet/lang/types/Annotation.java rename to idea/src/org/jetbrains/jet/lang/descriptors/Annotation.java index e233fa1a1ec..a5ae76f2b9e 100644 --- a/idea/src/org/jetbrains/jet/lang/types/Annotation.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/Annotation.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/ClassDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java similarity index 80% rename from idea/src/org/jetbrains/jet/lang/types/ClassDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java index b28df08c970..b2473699b46 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ClassDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java @@ -1,8 +1,11 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.JetScope; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeProjection; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java similarity index 97% rename from idea/src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java index ca59b4d3861..34977d30f31 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java @@ -1,9 +1,10 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.JetScope; import org.jetbrains.jet.lang.resolve.SubstitutingScope; +import org.jetbrains.jet.lang.types.*; import java.util.Collection; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/ClassifierDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java similarity index 63% rename from idea/src/org/jetbrains/jet/lang/types/ClassifierDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java index 4f382d98a53..036913dc649 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ClassifierDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java @@ -1,6 +1,8 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeConstructor; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java similarity index 89% rename from idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java index 10bdf70915c..e3b4262fbd8 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetType; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java similarity index 96% rename from idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java index 83444e5f2d0..b786a45904a 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java @@ -1,7 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java similarity index 90% rename from idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java index fc7e1459001..61bd90886bf 100644 --- a/idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java @@ -1,7 +1,8 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.TypeSubstitutor; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java similarity index 96% rename from idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java index 32f92cea01f..208c30ee13c 100644 --- a/idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorVisitor.java b/idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java similarity index 98% rename from idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorVisitor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java index ec5eeb73f06..15a6bdc30c9 100644 --- a/idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorVisitor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/ExtensionDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/ExtensionDescriptor.java similarity index 60% rename from idea/src/org/jetbrains/jet/lang/types/ExtensionDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ExtensionDescriptor.java index 547fc89513b..3e81f7ad020 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ExtensionDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ExtensionDescriptor.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/FunctionDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java similarity index 82% rename from idea/src/org/jetbrains/jet/lang/types/FunctionDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java index 4478f225dba..cbbd9db4228 100644 --- a/idea/src/org/jetbrains/jet/lang/types/FunctionDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java @@ -1,6 +1,8 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.List; import java.util.Set; diff --git a/idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java similarity index 96% rename from idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java index 82e7e4b96b2..c9e2bc1b0c2 100644 --- a/idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java @@ -1,8 +1,10 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorUtil.java similarity index 98% rename from idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java rename to idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorUtil.java index 2d212810193..d90228c802d 100644 --- a/idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorUtil.java @@ -1,13 +1,15 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.JetScope; import org.jetbrains.jet.lang.resolve.WritableScope; import org.jetbrains.jet.lang.resolve.WritableScopeImpl; +import org.jetbrains.jet.lang.types.*; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/types/FunctionGroup.java b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionGroup.java similarity index 93% rename from idea/src/org/jetbrains/jet/lang/types/FunctionGroup.java rename to idea/src/org/jetbrains/jet/lang/descriptors/FunctionGroup.java index da064c219af..05a5ded0fd9 100644 --- a/idea/src/org/jetbrains/jet/lang/types/FunctionGroup.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/FunctionGroup.java @@ -1,7 +1,8 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.OverloadResolutionResult; +import org.jetbrains.jet.lang.types.JetType; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/LazySubstitutingClassDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java similarity index 94% rename from idea/src/org/jetbrains/jet/lang/resolve/LazySubstitutingClassDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java index 1aede77aa2c..15d2ee7f4c2 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/LazySubstitutingClassDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java @@ -1,6 +1,8 @@ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.JetScope; +import org.jetbrains.jet.lang.resolve.SubstitutingScope; import org.jetbrains.jet.lang.types.*; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/LazySubstitutingFunctionGroup.java b/idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingFunctionGroup.java similarity index 94% rename from idea/src/org/jetbrains/jet/lang/types/LazySubstitutingFunctionGroup.java rename to idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingFunctionGroup.java index 757ee041c99..df79659cb71 100644 --- a/idea/src/org/jetbrains/jet/lang/types/LazySubstitutingFunctionGroup.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingFunctionGroup.java @@ -1,9 +1,11 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.OverloadResolutionResult; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/types/LocalVariableDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/LocalVariableDescriptor.java similarity index 86% rename from idea/src/org/jetbrains/jet/lang/types/LocalVariableDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/LocalVariableDescriptor.java index 671d4310b3a..fc9d44c5e9c 100644 --- a/idea/src/org/jetbrains/jet/lang/types/LocalVariableDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/LocalVariableDescriptor.java @@ -1,7 +1,9 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/MemberDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java similarity index 78% rename from idea/src/org/jetbrains/jet/lang/types/MemberDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java index e53fa28713c..97b8814acff 100644 --- a/idea/src/org/jetbrains/jet/lang/types/MemberDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/lang/types/MemberModifiers.java b/idea/src/org/jetbrains/jet/lang/descriptors/MemberModifiers.java similarity index 93% rename from idea/src/org/jetbrains/jet/lang/types/MemberModifiers.java rename to idea/src/org/jetbrains/jet/lang/descriptors/MemberModifiers.java index fca3e8e0067..506e08ba4db 100644 --- a/idea/src/org/jetbrains/jet/lang/types/MemberModifiers.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/MemberModifiers.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java similarity index 85% rename from idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java index 444b639c4bd..f20accd68a9 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/MutableClassDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java similarity index 98% rename from idea/src/org/jetbrains/jet/lang/resolve/MutableClassDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java index c6cddf28323..2892124cd4d 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/MutableClassDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java @@ -1,8 +1,9 @@ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.resolve.DescriptorUtil; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/MutableDeclarationDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java similarity index 83% rename from idea/src/org/jetbrains/jet/lang/resolve/MutableDeclarationDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java index 6cc5f93f698..f0a7e271660 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/MutableDeclarationDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java @@ -1,9 +1,6 @@ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.Annotation; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; -import org.jetbrains.jet.lang.types.DeclarationDescriptorVisitor; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/MutableFunctionDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/MutableFunctionDescriptor.java similarity index 72% rename from idea/src/org/jetbrains/jet/lang/types/MutableFunctionDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/MutableFunctionDescriptor.java index ce757cd85f1..093e50beb58 100644 --- a/idea/src/org/jetbrains/jet/lang/types/MutableFunctionDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/MutableFunctionDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetType; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/MutableValueParameterDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/MutableValueParameterDescriptor.java similarity index 69% rename from idea/src/org/jetbrains/jet/lang/types/MutableValueParameterDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/MutableValueParameterDescriptor.java index 26440ca8170..0d14b819dc3 100644 --- a/idea/src/org/jetbrains/jet/lang/types/MutableValueParameterDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/MutableValueParameterDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetType; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/Named.java b/idea/src/org/jetbrains/jet/lang/descriptors/Named.java similarity index 75% rename from idea/src/org/jetbrains/jet/lang/types/Named.java rename to idea/src/org/jetbrains/jet/lang/descriptors/Named.java index 8a8352f2bb2..c845cdef1b5 100644 --- a/idea/src/org/jetbrains/jet/lang/types/Named.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/Named.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java similarity index 89% rename from idea/src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java index ca04d87fefe..b56846a0d35 100644 --- a/idea/src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java @@ -1,8 +1,10 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.JetScope; +import org.jetbrains.jet.lang.types.NamespaceType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/PropertyAccessorDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java similarity index 91% rename from idea/src/org/jetbrains/jet/lang/types/PropertyAccessorDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java index ae7e02159d6..dcf5c90b6d2 100644 --- a/idea/src/org/jetbrains/jet/lang/types/PropertyAccessorDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/PropertyDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java similarity index 93% rename from idea/src/org/jetbrains/jet/lang/types/PropertyDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java index 9ea259a05eb..a35861150dd 100644 --- a/idea/src/org/jetbrains/jet/lang/types/PropertyDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java @@ -1,7 +1,10 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.jet.lang.types.Variance; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/PropertyGetterDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java similarity index 95% rename from idea/src/org/jetbrains/jet/lang/types/PropertyGetterDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java index 84fe74ae3e6..527c90c8a8b 100644 --- a/idea/src/org/jetbrains/jet/lang/types/PropertyGetterDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java @@ -1,8 +1,9 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/PropertySetterDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java similarity index 93% rename from idea/src/org/jetbrains/jet/lang/types/PropertySetterDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java index fa938abdbc0..03b5af83753 100644 --- a/idea/src/org/jetbrains/jet/lang/types/PropertySetterDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java @@ -1,7 +1,9 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetStandardClasses; +import org.jetbrains.jet.lang.types.JetType; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/TypeParameterDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java similarity index 97% rename from idea/src/org/jetbrains/jet/lang/types/TypeParameterDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java index 03306212b51..b7a5ff40255 100644 --- a/idea/src/org/jetbrains/jet/lang/types/TypeParameterDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.*; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java similarity index 83% rename from idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java index c64eb809d0b..0f76ee969ab 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java @@ -1,6 +1,7 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.types.JetType; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptorImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptorImpl.java similarity index 95% rename from idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptorImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptorImpl.java index 2eab4045570..e32f42ad54e 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptorImpl.java @@ -1,7 +1,9 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/VariableDescriptor.java b/idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java similarity index 84% rename from idea/src/org/jetbrains/jet/lang/types/VariableDescriptor.java rename to idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java index e01a962aa8f..c79eabb9fe8 100644 --- a/idea/src/org/jetbrains/jet/lang/types/VariableDescriptor.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java @@ -1,7 +1,9 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeSubstitutor; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/VariableDescriptorImpl.java b/idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java similarity index 92% rename from idea/src/org/jetbrains/jet/lang/types/VariableDescriptorImpl.java rename to idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java index 9175ceed35d..6ad55fe106a 100644 --- a/idea/src/org/jetbrains/jet/lang/types/VariableDescriptorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java @@ -1,7 +1,8 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.types.JetType; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/WritableFunctionGroup.java b/idea/src/org/jetbrains/jet/lang/descriptors/WritableFunctionGroup.java similarity index 96% rename from idea/src/org/jetbrains/jet/lang/resolve/WritableFunctionGroup.java rename to idea/src/org/jetbrains/jet/lang/descriptors/WritableFunctionGroup.java index f4557447971..f47a5237285 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/WritableFunctionGroup.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/WritableFunctionGroup.java @@ -1,7 +1,8 @@ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.jet.lang.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.OverloadResolutionResult; import org.jetbrains.jet.lang.types.*; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/idea/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java index c7a4872d9bc..3a2804cdcd1 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java @@ -14,11 +14,11 @@ import org.jetbrains.jet.lang.ErrorHandler; import org.jetbrains.jet.lang.JetDiagnostic; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetNamespace; import org.jetbrains.jet.lang.resolve.java.JavaPackageScope; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; -import org.jetbrains.jet.lang.types.ModuleDescriptor; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index 17a00c05a6a..96cb9e7a549 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -2,9 +2,9 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.Annotation; import org.jetbrains.jet.lang.psi.JetAttribute; import org.jetbrains.jet.lang.psi.JetModifierList; -import org.jetbrains.jet.lang.types.Annotation; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java index 7908c2d4aac..504b90a2a1a 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java @@ -3,6 +3,7 @@ package org.jetbrains.jet.lang.resolve; import com.intellij.psi.PsiElement; import org.jetbrains.jet.codegen.ClassCodegen; import org.jetbrains.jet.lang.JetDiagnostic; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/lang/types/BindingTrace.java b/idea/src/org/jetbrains/jet/lang/resolve/BindingTrace.java similarity index 93% rename from idea/src/org/jetbrains/jet/lang/types/BindingTrace.java rename to idea/src/org/jetbrains/jet/lang/resolve/BindingTrace.java index b7894bd3cb3..31a0db736fe 100644 --- a/idea/src/org/jetbrains/jet/lang/types/BindingTrace.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/BindingTrace.java @@ -1,10 +1,12 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.resolve; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.ErrorHandler; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.resolve.JetScope; +import org.jetbrains.jet.lang.types.JetType; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/types/BindingTraceAdapter.java b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceAdapter.java similarity index 92% rename from idea/src/org/jetbrains/jet/lang/types/BindingTraceAdapter.java rename to idea/src/org/jetbrains/jet/lang/resolve/BindingTraceAdapter.java index a4d4192bbd6..eb99fc5ec5f 100644 --- a/idea/src/org/jetbrains/jet/lang/types/BindingTraceAdapter.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceAdapter.java @@ -1,10 +1,12 @@ -package org.jetbrains.jet.lang.types; +package org.jetbrains.jet.lang.resolve; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.ErrorHandler; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.resolve.JetScope; +import org.jetbrains.jet.lang.types.JetType; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java index 368cbaee399..0418737536c 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java @@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.ClassCodegen; import org.jetbrains.jet.lang.ErrorHandler; import org.jetbrains.jet.lang.JetDiagnostic; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java index 84370246423..dffe9c8d500 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java @@ -5,6 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/JetScope.java b/idea/src/org/jetbrains/jet/lang/resolve/JetScope.java index 55c0eb62bf4..2306644bb08 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/JetScope.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/JetScope.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/JetScopeAdapter.java b/idea/src/org/jetbrains/jet/lang/resolve/JetScopeAdapter.java index 64a1e5eff41..de7c5d0d2aa 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/JetScopeAdapter.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/JetScopeAdapter.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/JetScopeImpl.java b/idea/src/org/jetbrains/jet/lang/resolve/JetScopeImpl.java index 2c6b8ca5a74..c22c745e844 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/JetScopeImpl.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/JetScopeImpl.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolutionResult.java b/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolutionResult.java index f49c7bd22ce..191f6943a42 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolutionResult.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolutionResult.java @@ -1,7 +1,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.FunctionDescriptor; +import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import java.util.Collection; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java index b4493a81cb2..6ab62b07b86 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java @@ -2,6 +2,9 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.jet.lang.descriptors.FunctionGroup; +import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.types.*; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/ScopeWithReceiver.java b/idea/src/org/jetbrains/jet/lang/resolve/ScopeWithReceiver.java index ce777ed3dda..d309e442247 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/ScopeWithReceiver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/ScopeWithReceiver.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; /** diff --git a/idea/src/org/jetbrains/jet/lang/resolve/SubstitutingScope.java b/idea/src/org/jetbrains/jet/lang/resolve/SubstitutingScope.java index ff655795089..baf1625a26e 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/SubstitutingScope.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/SubstitutingScope.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index dd71879a74a..601db4db4b1 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -12,6 +12,7 @@ import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.JetControlFlowProcessor; import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider; import org.jetbrains.jet.lang.cfg.pseudocode.*; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lexer.JetTokens; @@ -97,6 +98,33 @@ public class TopDownAnalyzer { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + private void collectNamespacesAndClassifiers( + @NotNull Collection declarations) { + for (JetDeclaration declaration : declarations) { + declaration.accept(new JetVisitor() { + @Override + public void visitNamespace(JetNamespace namespace) { + super.visitNamespace(namespace); // TODO + } + + @Override + public void visitClass(JetClass klass) { + super.visitClass(klass); // TODO + } + + @Override + public void visitTypedef(JetTypedef typedef) { + super.visitTypedef(typedef); // TODO + } + + @Override + public void visitExtension(JetExtension extension) { + super.visitExtension(extension); // TODO + } + }); + } + } + private void collectTypeDeclarators( @NotNull final WritableScope declaringScope, List declarations) { @@ -334,7 +362,6 @@ public class TopDownAnalyzer { } } } - } @Nullable diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java index 173eb0485d3..6f4c3da4027 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java @@ -3,6 +3,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.JetSemanticServices; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/WritableScope.java b/idea/src/org/jetbrains/jet/lang/resolve/WritableScope.java index 8f3019cc91a..0e7485b4d2f 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/WritableScope.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/WritableScope.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; /** diff --git a/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java b/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java index 7511f8ca375..d0052763a8b 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java @@ -3,6 +3,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.ErrorHandler; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeWithImports.java b/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeWithImports.java index f2c4c2af854..0a557bc4256 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeWithImports.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/WritableScopeWithImports.java @@ -2,10 +2,10 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.ClassifierDescriptor; -import org.jetbrains.jet.lang.types.FunctionGroup; -import org.jetbrains.jet.lang.types.NamespaceDescriptor; -import org.jetbrains.jet.lang.types.VariableDescriptor; +import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.jet.lang.descriptors.FunctionGroup; +import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; +import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import java.util.ArrayList; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java b/idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java index 425c8a5f281..2e46c632b8a 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java index 16b0e36ed95..1cd1cdeb39a 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java @@ -3,6 +3,7 @@ package org.jetbrains.jet.lang.resolve.java; import com.google.common.collect.Maps; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.JetScope; import org.jetbrains.jet.lang.types.*; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 09fff6b982e..0e7b4a6f45c 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -8,8 +8,9 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.MutableClassDescriptor; -import org.jetbrains.jet.lang.resolve.WritableFunctionGroup; +import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.MutableClassDescriptor; +import org.jetbrains.jet.lang.descriptors.WritableFunctionGroup; import org.jetbrains.jet.lang.types.*; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java index 936ba59ac62..851819057db 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java @@ -2,9 +2,9 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.JetScopeImpl; -import org.jetbrains.jet.lang.types.ClassifierDescriptor; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; -import org.jetbrains.jet.lang.types.NamespaceDescriptor; +import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaSemanticServices.java b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaSemanticServices.java index dfb43be9812..5560dda971c 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaSemanticServices.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaSemanticServices.java @@ -3,7 +3,7 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.JetSemanticServices; -import org.jetbrains.jet.lang.types.BindingTrace; +import org.jetbrains.jet.lang.resolve.BindingTrace; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java index 0a504f1afe7..e25ee8eb295 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java @@ -3,6 +3,9 @@ package org.jetbrains.jet.lang.resolve.java; import com.google.common.collect.Lists; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.Annotation; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.types.*; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java index 4aeccda9fb3..0e80076c7a6 100644 --- a/idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.JetScope; import org.jetbrains.jet.lang.resolve.OverloadResolutionResult; diff --git a/idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java b/idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java index 89a731c40fa..cac1fdbd14e 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java @@ -3,6 +3,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.ErrorHandler; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.JetScope; import org.jetbrains.jet.lang.resolve.WritableScope; import org.jetbrains.jet.lang.resolve.WritableScopeImpl; diff --git a/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java b/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java index e6b7b0406ed..35ca790b332 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java @@ -6,6 +6,8 @@ import com.intellij.psi.PsiFileFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.JetFileType; import org.jetbrains.jet.lang.JetSemanticServices; +import org.jetbrains.jet.lang.descriptors.Annotation; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.JetScope; diff --git a/idea/src/org/jetbrains/jet/lang/types/JetType.java b/idea/src/org/jetbrains/jet/lang/types/JetType.java index 62aa4969fc5..ca7a60bf2f5 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetType.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetType.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.Annotated; import org.jetbrains.jet.lang.resolve.JetScope; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java index fd1300b92b4..f507edca665 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java @@ -2,6 +2,8 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.Annotation; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java index bac64ee6332..95bfed796f8 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java @@ -3,6 +3,9 @@ package org.jetbrains.jet.lang.types; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.AnnotatedImpl; +import org.jetbrains.jet.lang.descriptors.Annotation; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.JetScope; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java index ee5c4cc211e..30ef2597453 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java @@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/lang/types/NamespaceType.java b/idea/src/org/jetbrains/jet/lang/types/NamespaceType.java index 9985c31255b..717bec1a049 100644 --- a/idea/src/org/jetbrains/jet/lang/types/NamespaceType.java +++ b/idea/src/org/jetbrains/jet/lang/types/NamespaceType.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.Annotation; import org.jetbrains.jet.lang.resolve.JetScope; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/idea/src/org/jetbrains/jet/lang/types/TypeConstructor.java index 9af1656205b..c3c5556682d 100644 --- a/idea/src/org/jetbrains/jet/lang/types/TypeConstructor.java +++ b/idea/src/org/jetbrains/jet/lang/types/TypeConstructor.java @@ -2,6 +2,9 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.Annotated; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import java.util.Collection; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java b/idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java index 16dc81e56c1..2ec5d281c2b 100644 --- a/idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java +++ b/idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java @@ -2,6 +2,10 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.AnnotatedImpl; +import org.jetbrains.jet.lang.descriptors.Annotation; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java b/idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java index 14ab2f2cac3..2ee2fbb843d 100644 --- a/idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java +++ b/idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.SubstitutingScope; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java b/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java index f0ef8b0648e..f7f18fba445 100644 --- a/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java +++ b/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java @@ -4,6 +4,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.Annotation; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.JetScope; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java b/idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java deleted file mode 100644 index 60247c6f8c1..00000000000 --- a/idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jetbrains.jet.lang.types.nullability; - -/** - * @author abreslav - */ -public class NullabilityDomain { - -} diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index e2eaf29626b..29146b30b52 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -4,11 +4,11 @@ import com.intellij.lang.documentation.DocumentationProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.DeclarationDescriptor; import org.jetbrains.jet.resolve.DescriptorUtil; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/resolve/DescriptorUtil.java b/idea/src/org/jetbrains/jet/resolve/DescriptorUtil.java index c76f9ad19f9..743a8c409fe 100644 --- a/idea/src/org/jetbrains/jet/resolve/DescriptorUtil.java +++ b/idea/src/org/jetbrains/jet/resolve/DescriptorUtil.java @@ -1,5 +1,6 @@ package org.jetbrains.jet.resolve; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.types.*; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 82ea651ee4f..8a08dbeb02d 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -8,6 +8,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.ErrorHandler; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java index c0dc55fa2e2..d74f13dd69c 100644 --- a/idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -11,6 +11,7 @@ import com.intellij.psi.search.GlobalSearchScope; import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBase; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.OverloadResolutionResult; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.parsing.JetParsingTest; diff --git a/idea/tests/org/jetbrains/jet/types/JetOverridingTest.java b/idea/tests/org/jetbrains/jet/types/JetOverridingTest.java index 3d1601f98c2..70d2a3ead0b 100644 --- a/idea/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/idea/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -3,8 +3,12 @@ package org.jetbrains.jet.types; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.PathManager; import org.jetbrains.jet.lang.JetSemanticServices; +import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.jet.lang.descriptors.FunctionDescriptorUtil; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetChangeUtil; import org.jetbrains.jet.lang.psi.JetFunction; +import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ClassDescriptorResolver; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.parsing.JetParsingTest; diff --git a/idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index 2ac21e81ab2..a265b0db4c5 100644 --- a/idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider; +import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetChangeUtil; import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetExpression;