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

Code regrouped

Browse Source
This commit is contained in:
Andrey Breslav
2011-05-10 15:40:38 +04:00
parent ec4bda880d
commit 6caaf6ecfb
95 changed files with 204 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ClassCodegen.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/codegen/Codegens.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/codegen/FrameMap.java
+1 -2
View File
@@ -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
idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+2
View File
@@ -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.*;
idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+4
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/ErrorHandler.java
+1 -1
View File
@@ -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;
/**
idea/src/org/jetbrains/jet/lang/JetDiagnostic.java
+1 -1
View File
@@ -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;
/**
idea/src/org/jetbrains/jet/lang/annotations/JetLineMarkerProvider.java
+1 -1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/annotations/JetPsiChecker.java
+3 -3
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/Annotated.java → idea/src/org/jetbrains/jet/lang/descriptors/Annotated.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
import java.util.List;
idea/src/org/jetbrains/jet/lang/types/AnnotatedImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/AnnotatedImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
import java.util.List;
idea/src/org/jetbrains/jet/lang/types/Annotation.java → idea/src/org/jetbrains/jet/lang/descriptors/Annotation.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
/**
* @author abreslav
idea/src/org/jetbrains/jet/lang/types/ClassDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
+4 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/ClassDescriptorImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/ClassifierDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java
+3 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/ConstructorDescriptorImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java
+2 -2
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java
+2 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/DeclarationDescriptorVisitor.java → idea/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
/**
* @author abreslav
idea/src/org/jetbrains/jet/lang/types/ExtensionDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/ExtensionDescriptor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
/**
* @author abreslav
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/FunctionDescriptorUtil.java → idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorUtil.java
+3 -1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/types/FunctionGroup.java → idea/src/org/jetbrains/jet/lang/descriptors/FunctionGroup.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/LazySubstitutingClassDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/LazySubstitutingFunctionGroup.java → idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingFunctionGroup.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/LocalVariableDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/LocalVariableDescriptor.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/MemberDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
import org.jetbrains.annotations.NotNull;
idea/src/org/jetbrains/jet/lang/types/MemberModifiers.java → idea/src/org/jetbrains/jet/lang/descriptors/MemberModifiers.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
/**
* @author abreslav
idea/src/org/jetbrains/jet/lang/types/ModuleDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/MutableClassDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/MutableDeclarationDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java
+1 -4
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/MutableFunctionDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/MutableFunctionDescriptor.java
+2 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/MutableValueParameterDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/MutableValueParameterDescriptor.java
+2 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/Named.java → idea/src/org/jetbrains/jet/lang/descriptors/Named.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.lang.types;
package org.jetbrains.jet.lang.descriptors;
import org.jetbrains.annotations.NotNull;
idea/src/org/jetbrains/jet/lang/types/NamespaceDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/PropertyAccessorDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/PropertyDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java
+4 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/PropertyGetterDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/PropertySetterDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/TypeParameterDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java
+2 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/ValueParameterDescriptorImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptorImpl.java
+3 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/VariableDescriptor.java → idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java
+3 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/VariableDescriptorImpl.java → idea/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/WritableFunctionGroup.java → idea/src/org/jetbrains/jet/lang/descriptors/WritableFunctionGroup.java
+2 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java
+1 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/types/BindingTrace.java → idea/src/org/jetbrains/jet/lang/resolve/BindingTrace.java
+4 -2
View File
@@ -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
idea/src/org/jetbrains/jet/lang/types/BindingTraceAdapter.java → idea/src/org/jetbrains/jet/lang/resolve/BindingTraceAdapter.java
+4 -2
View File
@@ -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
idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/JetScope.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/JetScopeAdapter.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/JetScopeImpl.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/OverloadResolutionResult.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
+3
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/resolve/ScopeWithReceiver.java
+1
View File
@@ -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.*;
/**
idea/src/org/jetbrains/jet/lang/resolve/SubstitutingScope.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+28 -1
View File
@@ -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<JetDeclaration> 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<JetDeclaration> declarations) {
@@ -334,7 +362,6 @@ public class TopDownAnalyzer {
}
}
}
}
@Nullable
idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/resolve/WritableScope.java
+1
View File
@@ -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.*;
/**
idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/resolve/WritableScopeWithImports.java
+4 -4
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+3 -2
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
+3 -3
View File
@@ -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
idea/src/org/jetbrains/jet/lang/resolve/java/JavaSemanticServices.java
+1 -1
View File
@@ -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
idea/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+3
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/ErrorUtils.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/JetStandardClasses.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
+2
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/JetType.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/JetTypeChecker.java
+2
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
+3
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/NamespaceType.java
+1
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/TypeConstructor.java
+3
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java
+4
View File
@@ -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;
idea/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java
+1
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
+3
View File
@@ -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.*;
idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java
-8
View File
@@ -1,8 +0,0 @@
package org.jetbrains.jet.lang.types.nullability;
/**
* @author abreslav
*/
public class NullabilityDomain {
}
idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
+1 -1
View File
@@ -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;
idea/src/org/jetbrains/jet/resolve/DescriptorUtil.java
+1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+4
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+1
View File
@@ -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;
idea/tests/org/jetbrains/jet/types/JetOverridingTest.java
+4
View File
@@ -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;
idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+1
View File
@@ -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;