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

Code refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-08-12 19:38:47 +04:00
parent 6b8800f392
commit 04bf0059ec
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt
+8 -13
View File
@@ -122,21 +122,16 @@ public class JetShortNamesCache(private val project: Project) : PsiShortNamesCac
destination.addAll(Arrays.asList<String>(*getAllClassNames())) destination.addAll(Arrays.asList<String>(*getAllClassNames()))
} }
/** public fun getTopLevelObjects(nameFilter: (String) -> Boolean, resolveSession: ResolveSessionForBodies, scope: GlobalSearchScope): Collection<ClassDescriptor> {
* Get kotlin non-extension top-level function names. Method is allowed to give invalid names - all result should be val allObjectNames = JetTopLevelObjectShortNameIndex.getInstance().getAllKeys(project).stream() +
* checked with getTopLevelFunctionDescriptorsByName(). JetFromJavaDescriptorHelper.getPossiblePackageDeclarationsNames(project, GlobalSearchScope.allScope(project)).stream()
*/ return allObjectNames
public fun getAllTopLevelFunctionNames(): Collection<String> { .filter(nameFilter)
return (JetTopLevelNonExtensionFunctionShortNameIndex.getInstance().getAllKeys(project) .toSet()
+ JetFromJavaDescriptorHelper.getPossiblePackageDeclarationsNames(project, GlobalSearchScope.allScope(project))).toSet() .flatMap { getTopLevelObjectsByName(it, resolveSession, scope) }
} }
public fun getAllTopLevelObjectNames(): Collection<String> { private fun getTopLevelObjectsByName(name: String, resolveSession: ResolveSessionForBodies, scope: GlobalSearchScope): Collection<ClassDescriptor> {
return (JetTopLevelObjectShortNameIndex.getInstance().getAllKeys(project)
+ JetFromJavaDescriptorHelper.getCompiledClassesForTopLevelObjects(project, GlobalSearchScope.allScope(project)).map { it.getName()!! }).toSet()
}
public fun getTopLevelObjectsByName(name: String, resolveSession: ResolveSessionForBodies, scope: GlobalSearchScope): Collection<ClassDescriptor> {
val result = hashSetOf<ClassDescriptor>() val result = hashSetOf<ClassDescriptor>()
val topObjects = JetTopLevelObjectShortNameIndex.getInstance().get(name, project, scope) val topObjects = JetTopLevelObjectShortNameIndex.getInstance().get(name, project, scope)
idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+3 -7
View File
@@ -155,13 +155,9 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
} }
private fun addKotlinTopLevelDeclarations() { private fun addKotlinTopLevelDeclarations() {
collector.addDescriptorElements(shortNamesCache.getTopLevelCallables({ prefixMatcher.prefixMatches(it) }, jetReference!!.expression, resolveSession, searchScope)) val filter = { (name: String) -> prefixMatcher.prefixMatches(name) }
collector.addDescriptorElements(shortNamesCache.getTopLevelCallables(filter, jetReference!!.expression, resolveSession, searchScope) +
for (name in shortNamesCache.getAllTopLevelObjectNames()) { shortNamesCache.getTopLevelObjects(filter, resolveSession, searchScope))
if (prefixMatcher.prefixMatches(name)) {
collector.addDescriptorElements(shortNamesCache.getTopLevelObjectsByName(name, resolveSession, searchScope))
}
}
} }
private fun addKotlinExtensions() { private fun addKotlinExtensions() {