From 7accbf7e28feff581a41b682a97698d1b129ac2d Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 4 Jun 2020 19:32:05 +0200
Subject: [PATCH] Extract interface from CompilerMessageLocation to ease
 extension

The CompilerMessageLocation is an implicit part of the binary daemon
protocol so changing it breaks compatibility with older daemons.
This change allows to extend location for non-daemon uses without
breaking the binary protocol.

Original commit: 5e33612238c798325f25650a8d5f6df26537f72d
---
 .../jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt  | 7 ++-----
 .../jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt  | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
index f603bec80e6..282fded48c8 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
@@ -16,19 +16,16 @@
 
 package org.jetbrains.kotlin.compilerRunner
 
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
 import org.jetbrains.kotlin.preloading.Preloader
 import org.jetbrains.kotlin.utils.KotlinPaths
-
+import org.jetbrains.kotlin.utils.KotlinPathsFromBaseDirectory
 import java.io.File
 import java.io.PrintStream
 import java.lang.ref.SoftReference
 
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
-import org.jetbrains.kotlin.utils.KotlinPathsFromBaseDirectory
-import org.jetbrains.kotlin.utils.SmartList
-
 object CompilerRunnerUtil {
     private var ourClassLoaderRef = SoftReference<ClassLoader>(null)
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt
index 870b4fc3d9c..3ac886c1d27 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.jps.build
 import org.jetbrains.jps.incremental.CompileContext
 import org.jetbrains.jps.incremental.messages.BuildMessage
 import org.jetbrains.jps.incremental.messages.CompilerMessage
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.config.CompilerRunnerConstants
@@ -21,7 +21,7 @@ class MessageCollectorAdapter(
 ) : MessageCollector {
     private var hasErrors = false
 
-    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
+    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageSourceLocation?) {
         hasErrors = hasErrors || severity.isError
 
         var prefix = ""