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

JET-107 Standard library classes are not shown in completion list

Browse Source
This commit is contained in:
Andrey Breslav
2011-06-17 15:32:48 +04:00
parent 646b8d4fa3
commit c4eecea575
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/resolve/WriteThroughScope.java
+8 -1
View File
@@ -1,5 +1,6 @@
package org.jetbrains.jet.lang.resolve; package org.jetbrains.jet.lang.resolve;
import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.ErrorHandler; import org.jetbrains.jet.lang.ErrorHandler;
@@ -13,6 +14,7 @@ import java.util.Collection;
*/ */
public class WriteThroughScope extends WritableScopeWithImports { public class WriteThroughScope extends WritableScopeWithImports {
private final WritableScope writableWorker; private final WritableScope writableWorker;
private Collection<DeclarationDescriptor> allDescriptors;
public WriteThroughScope(@NotNull JetScope outerScope, @NotNull WritableScope scope, @NotNull ErrorHandler errorHandler) { public WriteThroughScope(@NotNull JetScope outerScope, @NotNull WritableScope scope, @NotNull ErrorHandler errorHandler) {
super(outerScope, errorHandler); super(outerScope, errorHandler);
@@ -149,6 +151,11 @@ public class WriteThroughScope extends WritableScopeWithImports {
@Override @Override
public Collection<DeclarationDescriptor> getAllDescriptors() { public Collection<DeclarationDescriptor> getAllDescriptors() {
return writableWorker.getAllDescriptors(); if (allDescriptors == null) {
allDescriptors = Lists.newArrayList();
allDescriptors.addAll(writableWorker.getAllDescriptors());
allDescriptors.addAll(getWorkerScope().getAllDescriptors());
}
return allDescriptors;
} }
} }