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

Create modules with projects

Browse Source
This commit is contained in:
Nikolay Krasko
2014-12-24 17:35:24 +03:00
parent 2a417e822b
commit cdeaa484bc
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt
+3 -5
View File
@@ -107,15 +107,13 @@ private fun ModuleSourceInfo.isTests() = this is ModuleTestSourceInfo
public fun Module.productionSourceInfo(): ModuleProductionSourceInfo = ModuleProductionSourceInfo(this) public fun Module.productionSourceInfo(): ModuleProductionSourceInfo = ModuleProductionSourceInfo(this)
public fun Module.testSourceInfo(): ModuleTestSourceInfo = ModuleTestSourceInfo(this) public fun Module.testSourceInfo(): ModuleTestSourceInfo = ModuleTestSourceInfo(this)
private abstract class ModuleSourceScope : GlobalSearchScope() { private abstract class ModuleSourceScope(val module: Module) : GlobalSearchScope(module.getProject()) {
abstract val module: Module
override fun compare(file1: VirtualFile, file2: VirtualFile) = 0 override fun compare(file1: VirtualFile, file2: VirtualFile) = 0
override fun isSearchInModuleContent(aModule: Module) = aModule == module override fun isSearchInModuleContent(aModule: Module) = aModule == module
override fun isSearchInLibraries() = false override fun isSearchInLibraries() = false
} }
private data class ModuleProductionSourceScope(override val module: Module) : ModuleSourceScope() { private data class ModuleProductionSourceScope(module: Module) : ModuleSourceScope(module) {
val moduleFileIndex = ModuleRootManager.getInstance(module).getFileIndex() val moduleFileIndex = ModuleRootManager.getInstance(module).getFileIndex()
override fun contains(file: VirtualFile) = moduleFileIndex.isInSourceContent(file) && !moduleFileIndex.isInTestSourceContent(file) override fun contains(file: VirtualFile) = moduleFileIndex.isInSourceContent(file) && !moduleFileIndex.isInTestSourceContent(file)
@@ -124,7 +122,7 @@ private data class ModuleProductionSourceScope(override val module: Module) : Mo
override fun hashCode(): Int = module.hashCode() override fun hashCode(): Int = module.hashCode()
} }
private data class ModuleTestSourceScope(override val module: Module) : ModuleSourceScope() { private data class ModuleTestSourceScope(module: Module) : ModuleSourceScope(module) {
val moduleFileIndex = ModuleRootManager.getInstance(module).getFileIndex() val moduleFileIndex = ModuleRootManager.getInstance(module).getFileIndex()
override fun contains(file: VirtualFile) = moduleFileIndex.isInTestSourceContent(file) override fun contains(file: VirtualFile) = moduleFileIndex.isInTestSourceContent(file)