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

Cleanup

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-24 15:27:34 +04:00
parent 69080b72af
commit f929a7f5a9
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class KotlinLightClassForPackage extends KotlinLightClassForPackageBase i
private final FqName fqName; private final FqName fqName;
private final Collection<JetFile> files; private final Collection<JetFile> files;
private final int hashCode; private final int hashCode;
private CachedValue<PsiClass> delegate; private final CachedValue<PsiClass> delegate;
public KotlinLightClassForPackage(@NotNull PsiManager manager, @NotNull FqName fqName, @NotNull Collection<JetFile> files) { public KotlinLightClassForPackage(@NotNull PsiManager manager, @NotNull FqName fqName, @NotNull Collection<JetFile> files) {
super(manager); super(manager);
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackageProvider.java
+3 -5
View File
@@ -53,18 +53,16 @@ public class KotlinLightClassForPackageProvider implements CachedValueProvider<P
this.project = project; this.project = project;
} }
@Nullable @Nullable
@Override @Override
public Result<PsiClass> compute() { public Result<PsiClass> compute() {
checkForBuiltIns(); checkForBuiltIns();
final PsiJavaFileStubImpl javaFileStub = new PsiJavaFileStubImpl(fqName.getFqName(), true); PsiJavaFileStubImpl javaFileStub = new PsiJavaFileStubImpl(fqName.getFqName(), true);
final Stack<StubElement> stubStack = new Stack<StubElement>(); Stack<StubElement> stubStack = new Stack<StubElement>();
final ClassBuilderFactory builderFactory = new KotlinLightClassBuilderFactory(stubStack); ClassBuilderFactory builderFactory = new KotlinLightClassBuilderFactory(stubStack);
// The context must reflect _all files in the module_. not only the current file // The context must reflect _all files in the module_. not only the current file
// Otherwise, the analyzer gets confused and can't, for example, tell which files come as sources and which // Otherwise, the analyzer gets confused and can't, for example, tell which files come as sources and which
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationStrategy.java
+5 -1
View File
@@ -43,7 +43,11 @@ class LightClassGenerationStrategy implements GenerationStrategy {
private final PsiJavaFileStubImpl answer; private final PsiJavaFileStubImpl answer;
private final VirtualFile virtualFile; private final VirtualFile virtualFile;
public LightClassGenerationStrategy(@NotNull VirtualFile virtualFile, Stack<StubElement> stubStack, PsiJavaFileStubImpl answer) { public LightClassGenerationStrategy(
@NotNull VirtualFile virtualFile,
@NotNull Stack<StubElement> stubStack,
@NotNull PsiJavaFileStubImpl answer
) {
this.virtualFile = virtualFile; this.virtualFile = virtualFile;
this.stubStack = stubStack; this.stubStack = stubStack;
this.answer = answer; this.answer = answer;