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

Fixed deprecated IDEA API

Browse Source 
#KT-24907 Fixed
This commit is contained in:
Alexander Podkhalyuzin
2018-09-06 10:16:39 +03:00
parent 720587abf3
commit 8e9945bc9e
2 changed files with 6 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/LibraryModificationTracker.kt
+3 -3
View File
@@ -15,7 +15,7 @@ import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.openapi.roots.ProjectFileIndex
import com.intellij.openapi.util.SimpleModificationTracker 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.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.openapi.vfs.newvfs.BulkFileListener import com.intellij.openapi.vfs.newvfs.BulkFileListener
@@ -93,10 +93,10 @@ class LibraryModificationTracker(project: Project) : SimpleModificationTracker()
private fun isLibraryArchiveRoot(virtualFile: VirtualFile): Boolean { private fun isLibraryArchiveRoot(virtualFile: VirtualFile): Boolean {
if (virtualFile.fileType != ArchiveFileType.INSTANCE) return false 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) return projectFileIndex.isInLibraryClasses(archiveRoot)
} }
} }
private fun isRelevantEvent(vFileEvent: VFileEvent) = private fun isRelevantEvent(vFileEvent: VFileEvent) =
vFileEvent is VFileCreateEvent || vFileEvent is VFileMoveEvent || vFileEvent is VFileCopyEvent vFileEvent is VFileCreateEvent || vFileEvent is VFileMoveEvent || vFileEvent is VFileCopyEvent
idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt
+3 -3
View File
@@ -23,8 +23,8 @@ import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable
import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.roots.libraries.Library
import com.intellij.openapi.roots.libraries.PersistentLibraryKind import com.intellij.openapi.roots.libraries.PersistentLibraryKind
import com.intellij.openapi.vfs.JarFileSystem
import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PlatformTestCase
import org.jetbrains.kotlin.test.testFramework.runWriteAction 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( fun Module.addDependency(
library: Library, library: Library,
dependencyScope: DependencyScope = DependencyScope.COMPILE, dependencyScope: DependencyScope = DependencyScope.COMPILE,
exported: Boolean = false exported: Boolean = false
) = ModuleRootModificationUtil.addDependency(this, library, dependencyScope, exported) ) = ModuleRootModificationUtil.addDependency(this, library, dependencyScope, exported)