SourceLocationManager -> SourceManager

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/PsiSourceManager.kt

@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.psi2ir
 
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.ir.SourceLocationManager
+import org.jetbrains.kotlin.ir.SourceManager
 import org.jetbrains.kotlin.ir.SourceRangeInfo
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import java.util.*
 
-class PsiSourceManager : SourceLocationManager {
+class PsiSourceManager : SourceManager {
-    class PsiFileEntry(psiFile: PsiFile) : SourceLocationManager.FileEntry {
+    class PsiFileEntry(psiFile: PsiFile) : SourceManager.FileEntry {
         private val psiFileName = psiFile.virtualFile?.path ?: psiFile.name
 
         override val maxOffset: Int
@@ -85,6 +85,6 @@ class PsiSourceManager : SourceLocationManager {
     fun getFileEntry(psiFile: PsiFile): PsiFileEntry? =
             fileEntriesByPsiFile[psiFile]
 
-    override fun getFileEntry(irFile: IrFile): SourceLocationManager.FileEntry =
+    override fun getFileEntry(irFile: IrFile): SourceManager.FileEntry =
             fileEntriesByIrFile[irFile]!!
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/SourceManager.kt

@@ -30,7 +30,7 @@ data class SourceRangeInfo(
         val endColumnNumber: Int
 )
 
-interface SourceLocationManager {
+interface SourceManager {
     interface FileEntry {
         val maxOffset: Int
         fun getSourceRangeInfo(beginOffset: Int, endOffset: Int): SourceRangeInfo

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFile.kt

@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.ir.declarations
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.SourceLocationManager
+import org.jetbrains.kotlin.ir.SourceManager
 
 interface IrFile : IrElement {
     val name: String
-    val fileEntry: SourceLocationManager.FileEntry
+    val fileEntry: SourceManager.FileEntry
     val fileAnnotations: List<AnnotationDescriptor>
     val packageFragmentDescriptor: PackageFragmentDescriptor
     val declarations: List<IrDeclaration>

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt

@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.SmartList
 import java.util.*
 
 class IrFileImpl(
-        override val fileEntry: SourceLocationManager.FileEntry,
+        override val fileEntry: SourceManager.FileEntry,
         override val name: String,
         override val packageFragmentDescriptor: PackageFragmentDescriptor
 ) : IrElementBase(0, fileEntry.maxOffset), IrFile {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.ir.util
 
 import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.SourceLocationManager
+import org.jetbrains.kotlin.ir.SourceManager
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
@@ -184,7 +184,7 @@ class DumpIrTreeVisitor(out: Appendable): IrElementVisitor<Unit, String> {
 }
 
 class DumpTreeFromSourceLineVisitor(
-        val fileEntry: SourceLocationManager.FileEntry,
+        val fileEntry: SourceManager.FileEntry,
         val lineNumber: Int,
         out: Appendable
 ): IrElementVisitorVoid {