From 8e9945bc9e364f109075fa7c371df73421d407a0 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Thu, 6 Sep 2018 10:16:39 +0300 Subject: [PATCH] Fixed deprecated IDEA API #KT-24907 Fixed --- .../idea/caches/project/LibraryModificationTracker.kt | 6 +++--- .../org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryModificationTracker.kt index 9dd668307c0..59512365ad2 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryModificationTracker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryModificationTracker.kt @@ -15,7 +15,7 @@ import com.intellij.openapi.project.DumbService import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.openapi.util.SimpleModificationTracker -import com.intellij.openapi.vfs.StandardFileSystems +import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileManager import com.intellij.openapi.vfs.newvfs.BulkFileListener @@ -93,10 +93,10 @@ class LibraryModificationTracker(project: Project) : SimpleModificationTracker() private fun isLibraryArchiveRoot(virtualFile: VirtualFile): Boolean { if (virtualFile.fileType != ArchiveFileType.INSTANCE) return false - val archiveRoot = StandardFileSystems.getJarRootForLocalFile(virtualFile) ?: return false + val archiveRoot = JarFileSystem.getInstance().getRootByLocal(virtualFile) ?: return false return projectFileIndex.isInLibraryClasses(archiveRoot) } } private fun isRelevantEvent(vFileEvent: VFileEvent) = - vFileEvent is VFileCreateEvent || vFileEvent is VFileMoveEvent || vFileEvent is VFileCopyEvent \ No newline at end of file + vFileEvent is VFileCreateEvent || vFileEvent is VFileMoveEvent || vFileEvent is VFileCopyEvent diff --git a/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt b/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt index 58bcd97039c..b229714e87b 100644 --- a/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt +++ b/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt @@ -23,8 +23,8 @@ import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.roots.libraries.PersistentLibraryKind +import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.LocalFileSystem -import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFile import com.intellij.testFramework.PlatformTestCase import org.jetbrains.kotlin.test.testFramework.runWriteAction @@ -52,10 +52,10 @@ fun PlatformTestCase.projectLibrary( } } -val File.jarRoot get() = StandardFileSystems.getJarRootForLocalFile(LocalFileSystem.getInstance().findFileByIoFile(this)!!)!! +val File.jarRoot get() = JarFileSystem.getInstance().getRootByLocal(LocalFileSystem.getInstance().findFileByIoFile(this)!!)!! fun Module.addDependency( library: Library, dependencyScope: DependencyScope = DependencyScope.COMPILE, exported: Boolean = false -) = ModuleRootModificationUtil.addDependency(this, library, dependencyScope, exported) \ No newline at end of file +) = ModuleRootModificationUtil.addDependency(this, library, dependencyScope, exported)