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

Add ability to search kotlin classes in selected scope

Browse Source
This commit is contained in:
Nikolay Krasko
2013-07-02 18:28:04 +04:00
parent 03053711f4
commit 86274466c5
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+6 -4
View File
@@ -348,23 +348,25 @@ public class JetShortNamesCache extends PsiShortNamesCache {
public Collection<ClassDescriptor> getJetClassesDescriptors(
@NotNull Condition<String> acceptedShortNameCondition,
@NotNull KotlinCodeAnalyzer analyzer
@NotNull KotlinCodeAnalyzer analyzer,
@NotNull GlobalSearchScope searchScope
) {
Collection<ClassDescriptor> classDescriptors = new ArrayList<ClassDescriptor>();
for (String fqName : JetFullClassNameIndex.getInstance().getAllKeys(project)) {
FqName classFQName = new FqName(fqName);
if (acceptedShortNameCondition.value(classFQName.shortName().asString())) {
classDescriptors.addAll(getJetClassesDescriptorsByFQName(analyzer, classFQName));
classDescriptors.addAll(getJetClassesDescriptorsByFQName(analyzer, classFQName, searchScope));
}
}
return classDescriptors;
}
private Collection<ClassDescriptor> getJetClassesDescriptorsByFQName(@NotNull KotlinCodeAnalyzer analyzer, @NotNull FqName classFQName) {
private Collection<ClassDescriptor> getJetClassesDescriptorsByFQName(
@NotNull KotlinCodeAnalyzer analyzer, @NotNull FqName classFQName, @NotNull GlobalSearchScope searchScope) {
Collection<JetClassOrObject> jetClassOrObjects = JetFullClassNameIndex.getInstance().get(
classFQName.asString(), project, GlobalSearchScope.allScope(project));
classFQName.asString(), project, searchScope);
if (jetClassOrObjects.isEmpty()) {
// This fqn is absent in caches, dead or not in scope
idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.asJava.KotlinLightClass;
@@ -46,7 +47,7 @@ public class JetTypesCompletionHelper {
Project project = parameters.getOriginalFile().getProject();
JetShortNamesCache namesCache = JetShortNamesCache.getKotlinInstance(project);
jetCompletionResult.addAllElements(namesCache.getJetClassesDescriptors(
jetCompletionResult.getShortNameFilter(), jetCompletionResult.getResolveSession()));
jetCompletionResult.getShortNameFilter(), jetCompletionResult.getResolveSession(), GlobalSearchScope.allScope(project)));
if (!KotlinFrameworkDetector.isJsKotlinModule((JetFile) parameters.getOriginalFile())) {
addAdaptedJavaCompletion(parameters, jetCompletionResult);
idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
+1 -1
View File
@@ -213,7 +213,7 @@ public class AutoImportFix extends JetHintAction<JetSimpleNameExpression> implem
public boolean value(String s) {
return typeName.equals(s);
}
}, resolveSession);
}, resolveSession, GlobalSearchScope.allScope(project));
return Collections2.transform(descriptors, new Function<ClassDescriptor, FqName>() {
@Override