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

Removed deprecated usage of ScratchFileService.isInScratchRoot

Browse Source 
#KT-35918 Comment
This commit is contained in:
Vladimir Dolzhenko
2020-02-03 17:26:48 +01:00
parent 7c8f3b2b3b
commit 617807beea
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt
+4 -4
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.caches.project package org.jetbrains.kotlin.idea.caches.project
import com.intellij.ide.scratch.ScratchFileService import com.intellij.ide.scratch.ScratchFileService
import com.intellij.ide.scratch.ScratchRootType
import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.* import com.intellij.openapi.roots.*
@@ -80,12 +81,11 @@ fun getScriptRelatedModuleInfo(project: Project, virtualFile: VirtualFile): Modu
return moduleRelatedModuleInfo return moduleRelatedModuleInfo
} }
if (ScratchFileService.isInScratchRoot(virtualFile)) { return if (ScratchFileService.findRootType(virtualFile) != ScratchRootType.getInstance()) null
else {
val scratchModule = virtualFile.scriptRelatedModuleName?.let { ModuleManager.getInstance(project).findModuleByName(it) } val scratchModule = virtualFile.scriptRelatedModuleName?.let { ModuleManager.getInstance(project).findModuleByName(it) }
return scratchModule?.testSourceInfo() ?: scratchModule?.productionSourceInfo() scratchModule?.testSourceInfo() ?: scratchModule?.productionSourceInfo()
} }
return null
} }
private typealias VirtualFileProcessor<T> = (Project, VirtualFile, Boolean) -> T private typealias VirtualFileProcessor<T> = (Project, VirtualFile, Boolean) -> T
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchAdditionalIdeaDependenciesProvider.kt
+5 -2
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.scratch package org.jetbrains.kotlin.idea.scratch
import com.intellij.ide.scratch.ScratchFileService import com.intellij.ide.scratch.ScratchFileService
import com.intellij.ide.scratch.ScratchRootType
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -19,7 +20,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull
class ScratchAdditionalIdeaDependenciesProvider : ScriptAdditionalIdeaDependenciesProvider() { class ScratchAdditionalIdeaDependenciesProvider : ScriptAdditionalIdeaDependenciesProvider() {
override fun getRelatedModules(file: VirtualFile, project: Project): List<Module> { override fun getRelatedModules(file: VirtualFile, project: Project): List<Module> {
if (!ScratchFileService.isInScratchRoot(file)) return emptyList() if (!isInScratchRoot(file)) return emptyList()
val scratchModule = file.scriptRelatedModuleName?.let { val scratchModule = file.scriptRelatedModuleName?.let {
ModuleManager.getInstance(project).findModuleByName(it) ModuleManager.getInstance(project).findModuleByName(it)
@@ -37,7 +38,7 @@ class ScratchAdditionalIdeaDependenciesProvider : ScriptAdditionalIdeaDependenci
} }
override fun getRelatedLibraries(file: VirtualFile, project: Project): List<Library> { override fun getRelatedLibraries(file: VirtualFile, project: Project): List<Library> {
if (!ScratchFileService.isInScratchRoot(file)) return emptyList() if (!isInScratchRoot(file)) return emptyList()
val result = linkedSetOf<Library>() val result = linkedSetOf<Library>()
getRelatedModules(file, project).forEach { getRelatedModules(file, project).forEach {
@@ -51,6 +52,8 @@ class ScratchAdditionalIdeaDependenciesProvider : ScriptAdditionalIdeaDependenci
return result.toList() return result.toList()
} }
private inline fun isInScratchRoot(file: VirtualFile) = ScratchFileService.findRootType(file) == ScratchRootType.getInstance()
private fun moduleDependencyEnumerator(it: Module): OrderEnumerator { private fun moduleDependencyEnumerator(it: Module): OrderEnumerator {
return ModuleRootManager.getInstance(it).orderEntries() return ModuleRootManager.getInstance(it).orderEntries()
.compileOnly().withoutSdk().recursively().exportedOnly() .compileOnly().withoutSdk().recursively().exportedOnly()