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

Factory method introduced

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-19 17:08:18 +04:00
parent 26ccb80abb
commit 2b1f8b843c
14 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/stubindex/JetAllPackagesIndex.java
+1 -1
View File
@@ -50,6 +50,6 @@ public class JetAllPackagesIndex extends StringStubIndexExtension<JetFile> {
@Override
public Collection<JetFile> get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(fqName, project, new JetSourceFilterScope(scope));
return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetAllShortFunctionNameIndex extends StringStubIndexExtension<JetNa
@Override
public Collection<JetNamedFunction> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetAnnotationsIndex extends StringStubIndexExtension<JetAnnotationE
@Override
public Collection<JetAnnotationEntry> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetClassByPackageIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetClassByPackageIndex extends StringStubIndexExtension<JetClassOrO
@Override
public Collection<JetClassOrObject> get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(fqName, project, new JetSourceFilterScope(scope));
return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetFullClassNameIndex extends StringStubIndexExtension<JetClassOrOb
@Override
public Collection<JetClassOrObject> get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(fqName, project, new JetSourceFilterScope(scope));
return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetPackageDeclarationIndex.java
+1 -1
View File
@@ -50,6 +50,6 @@ public class JetPackageDeclarationIndex extends StringStubIndexExtension<JetFile
@Override
public Collection<JetFile> get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(fqName, project, new JetSourceFilterScope(scope));
return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetShortClassNameIndex extends StringStubIndexExtension<JetClassOrO
@Override
public Collection<JetClassOrObject> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetShortFunctionNameIndex extends StringStubIndexExtension<JetNamed
@Override
public Collection<JetNamedFunction> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetShortPropertiesNameIndex extends StringStubIndexExtension<JetPro
@Override
public Collection<JetProperty> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java
+5 -1
View File
@@ -26,9 +26,13 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetFileType;
public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
public static JetSourceFilterScope kotlinSourcesAndLibraries(@NotNull GlobalSearchScope delegate) {
return new JetSourceFilterScope(delegate);
}
private final ProjectFileIndex myIndex;
public JetSourceFilterScope(@NotNull final GlobalSearchScope delegate) {
private JetSourceFilterScope(@NotNull final GlobalSearchScope delegate) {
super(delegate);
myIndex = ProjectRootManager.getInstance(getProject()).getFileIndex();
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetSuperClassIndex extends StringStubIndexExtension<JetClassOrObjec
@Override
public Collection<JetClassOrObject> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java
+1 -1
View File
@@ -47,6 +47,6 @@ public class JetTopLevelFunctionsFqnNameIndex extends StringStubIndexExtension<J
@Override
public Collection<JetNamedFunction> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetTopLevelPropertiesFqnNameIndex extends StringStubIndexExtension<
@Override
public Collection<JetProperty> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java
+1 -1
View File
@@ -44,6 +44,6 @@ public class JetTopLevelShortObjectNameIndex extends StringStubIndexExtension<Je
@Override
public Collection<JetObjectDeclaration> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
return super.get(s, project, new JetSourceFilterScope(scope));
return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope));
}
}