Rename SourceFileToPathConverter->FileToPathConverter

Original commit: 77d74a261d

jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt

@@ -7,12 +7,12 @@ package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
-import org.jetbrains.kotlin.incremental.storage.SourceFileToPathConverter
+import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
 import java.io.File
 
 private const val PROJECT_DIR_PLACEHOLDER = "${'$'}PROJECT_DIR$"
 
-internal class JpsSourceFileToPathConverter(jpsProject: JpsProject) : SourceFileToPathConverter {
+internal class JpsFileToPathConverter(jpsProject: JpsProject) : FileToPathConverter {
     private val baseDirPath = JpsModelSerializationDataService
         .getBaseDirectory(jpsProject)?.canonicalFile?.invariantSeparatorsPath
 

jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt

@@ -12,11 +12,9 @@ import org.jetbrains.jps.incremental.GlobalContextKey
 import org.jetbrains.jps.incremental.fs.CompilationRound
 import org.jetbrains.jps.incremental.messages.BuildMessage
 import org.jetbrains.jps.incremental.messages.CompilerMessage
-import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
 import org.jetbrains.kotlin.config.CompilerRunnerConstants
 import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.storage.SourceFileToCanonicalPathConverter
-import org.jetbrains.kotlin.incremental.storage.SourceFileToPathConverter
+import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
 import org.jetbrains.kotlin.jps.incremental.*
 import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndex
 import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndexBuilder
@@ -69,10 +67,10 @@ class KotlinCompileContext(val jpsContext: CompileContext) {
 
     val hasKotlinMarker = HasKotlinMarker(dataManager)
 
-    val sourceFileToPathConverter: SourceFileToPathConverter =
-        JpsSourceFileToPathConverter(jpsContext.projectDescriptor.project)
+    val fileToPathConverter: FileToPathConverter =
+        JpsFileToPathConverter(jpsContext.projectDescriptor.project)
 
-    val lookupStorageManager = JpsLookupStorageManager(dataManager, sourceFileToPathConverter)
+    val lookupStorageManager = JpsLookupStorageManager(dataManager, fileToPathConverter)
 
     /**
      * Flag to prevent rebuilding twice.

jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCache.kt

@@ -24,7 +24,7 @@ import org.jetbrains.jps.incremental.storage.StorageOwner
 import org.jetbrains.kotlin.incremental.IncrementalCacheCommon
 import org.jetbrains.kotlin.incremental.IncrementalJsCache
 import org.jetbrains.kotlin.incremental.IncrementalJvmCache
-import org.jetbrains.kotlin.incremental.storage.SourceFileToPathConverter
+import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
 import org.jetbrains.kotlin.jps.build.KotlinBuilder
 import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
 import java.io.File
@@ -36,8 +36,8 @@ interface JpsIncrementalCache : IncrementalCacheCommon, StorageOwner {
 class JpsIncrementalJvmCache(
     target: ModuleBuildTarget,
     paths: BuildDataPaths,
-    sourcePathConverter: SourceFileToPathConverter
-) : IncrementalJvmCache(paths.getTargetDataRoot(target), target.outputDir, sourcePathConverter), JpsIncrementalCache {
+    pathConverter: FileToPathConverter
+) : IncrementalJvmCache(paths.getTargetDataRoot(target), target.outputDir, pathConverter), JpsIncrementalCache {
     override fun addJpsDependentCache(cache: JpsIncrementalCache) {
         if (cache is JpsIncrementalJvmCache) {
             addDependentCache(cache)
@@ -52,8 +52,8 @@ class JpsIncrementalJvmCache(
 class JpsIncrementalJsCache(
     target: ModuleBuildTarget,
     paths: BuildDataPaths,
-    sourcePathConverter: SourceFileToPathConverter
-) : IncrementalJsCache(paths.getTargetDataRoot(target), sourcePathConverter), JpsIncrementalCache {
+    pathConverter: FileToPathConverter
+) : IncrementalJsCache(paths.getTargetDataRoot(target), pathConverter), JpsIncrementalCache {
     override fun addJpsDependentCache(cache: JpsIncrementalCache) {
         if (cache is JpsIncrementalJsCache) {
             addDependentCache(cache)

jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt

@@ -22,7 +22,7 @@ import org.jetbrains.jps.builders.storage.StorageProvider
 import org.jetbrains.jps.incremental.storage.BuildDataManager
 import org.jetbrains.jps.incremental.storage.StorageOwner
 import org.jetbrains.kotlin.incremental.LookupStorage
-import org.jetbrains.kotlin.incremental.storage.SourceFileToPathConverter
+import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
 import java.io.File
 import java.io.IOException
 
@@ -30,9 +30,9 @@ private object LookupStorageLock
 
 class JpsLookupStorageManager(
     private val buildDataManager: BuildDataManager,
-    sourcePathConverter: SourceFileToPathConverter
+    pathConverter: FileToPathConverter
 ) {
-    private val storageProvider = JpsLookupStorageProvider(sourcePathConverter)
+    private val storageProvider = JpsLookupStorageProvider(pathConverter)
 
     fun cleanLookupStorage(log: Logger) {
         synchronized(LookupStorageLock) {
@@ -58,14 +58,14 @@ class JpsLookupStorageManager(
     }
 
     private class JpsLookupStorageProvider(
-        private val sourcePathConverter: SourceFileToPathConverter
+        private val pathConverter: FileToPathConverter
     ) : StorageProvider<JpsLookupStorage>() {
         override fun createStorage(targetDataDir: File): JpsLookupStorage =
-            JpsLookupStorage(targetDataDir, sourcePathConverter)
+            JpsLookupStorage(targetDataDir, pathConverter)
     }
 
     private class JpsLookupStorage(
         targetDataDir: File,
-        sourcePathConverter: SourceFileToPathConverter
-    ) : StorageOwner, LookupStorage(targetDataDir, sourcePathConverter)
+        pathConverter: FileToPathConverter
+    ) : StorageOwner, LookupStorage(targetDataDir, pathConverter)
 }

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJsModuleBuildTarget.kt

@@ -208,7 +208,7 @@ class KotlinJsModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleBu
     }
 
     override fun createCacheStorage(paths: BuildDataPaths) =
-        JpsIncrementalJsCache(jpsModuleBuildTarget, paths, kotlinContext.sourceFileToPathConverter)
+        JpsIncrementalJsCache(jpsModuleBuildTarget, paths, kotlinContext.fileToPathConverter)
 
     override fun updateCaches(
         dirtyFilesHolder: KotlinDirtySourceFilesHolder,

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt

@@ -56,7 +56,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
         get() = IncrementalCompilation.isEnabledForJvm()
 
     override fun createCacheStorage(paths: BuildDataPaths) =
-        JpsIncrementalJvmCache(jpsModuleBuildTarget, paths, kotlinContext.sourceFileToPathConverter)
+        JpsIncrementalJvmCache(jpsModuleBuildTarget, paths, kotlinContext.fileToPathConverter)
 
     override val buildMetaInfoFactory
         get() = JvmBuildMetaInfo