Move Location to util module

It's used both from repl and compiler, which won't depend on each other in subsequent commits.
com-lihaoyi · Jan 14, 2021 · 6e8202b · 6e8202b
1 parent ba548bc
commit 6e8202b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/amm/repl/api/src/main/scala/ammonite/repl/api/SourceAPI.scala b/amm/repl/api/src/main/scala/ammonite/repl/api/SourceAPI.scala
@@ -3,8 +3,7 @@ package ammonite.repl.api
 import ammonite.interp.api.APIHolder
 import ammonite.repl.tools.Desugared
 import ammonite.util.CodeColors
-
-case class Location(fileName: String, lineNum: Int, fileContent: String)
+import ammonite.util.Util.Location
 
 trait SourceAPI {
 

diff --git a/amm/repl/api/src/main/scala/ammonite/repl/tools/source.scala b/amm/repl/api/src/main/scala/ammonite/repl/tools/source.scala
@@ -1,8 +1,8 @@
 package ammonite.repl.tools
 
-import ammonite.repl.api.Location
 import ammonite.runtime.tools.browse.Strings
 import ammonite.util.CodeColors
+import ammonite.util.Util.Location
 import sourcecode.Compat._
 
 import scala.annotation.tailrec

diff --git a/amm/repl/src/main/scala/ammonite/repl/ApiImpls.scala b/amm/repl/src/main/scala/ammonite/repl/ApiImpls.scala
@@ -1,7 +1,7 @@
 package ammonite.repl
 
 import ammonite.ops.Internals
-import ammonite.repl.api.{Clipboard, FrontEnd, FrontEndAPI, Location, Session, SourceAPI}
+import ammonite.repl.api.{Clipboard, FrontEnd, FrontEndAPI, Session, SourceAPI}
 import ammonite.repl.tools.{Desugared, SourceRuntime}
 import ammonite.runtime._
 import ammonite.util.Util._

diff --git a/amm/repl/src/main/scala/ammonite/repl/tools/SourceRuntime.scala b/amm/repl/src/main/scala/ammonite/repl/tools/SourceRuntime.scala
@@ -4,10 +4,9 @@ import javassist.{ByteArrayClassPath, CtClass, CtMethod}
 
 
 import ammonite.repl.Highlighter
-import ammonite.repl.api.Location
 import ammonite.runtime.tools.browse.Strings
 import ammonite.util.CodeColors
-import ammonite.util.Util.newLine
+import ammonite.util.Util.{Location, newLine}
 import scala.collection.mutable
 import scala.language.experimental.macros
 

diff --git a/amm/repl/src/test/scala-2.12/ammonite/unit/SourceTests212.scala b/amm/repl/src/test/scala-2.12/ammonite/unit/SourceTests212.scala
@@ -2,10 +2,11 @@ package ammonite.unit
 
 
 import ammonite.repl.SourceAPIImpl
-import ammonite.repl.api.{Location, SourceBridge}
+import ammonite.repl.api.SourceBridge
 import utest._
 import ammonite.repl.tools.source.load
 import ammonite.util.Util
+import ammonite.util.Util.Location
 //import fastparse.utils.{ElemSetHelper, Generator, IndexedParserInput}
 
 object SourceTests212 extends TestSuite{

diff --git a/amm/repl/src/test/scala/ammonite/unit/SourceTests.scala b/amm/repl/src/test/scala/ammonite/unit/SourceTests.scala
@@ -2,10 +2,11 @@ package ammonite.unit
 
 
 import ammonite.repl.SourceAPIImpl
-import ammonite.repl.api.{Location, SourceBridge}
+import ammonite.repl.api.SourceBridge
 import utest._
 import ammonite.repl.tools.source.load
 import ammonite.util.Util
+import ammonite.util.Util.Location
 
 import java.io.InputStream
 object SourceTests extends TestSuite{

diff --git a/amm/util/src/main/scala/ammonite/util/Util.scala b/amm/util/src/main/scala/ammonite/util/Util.scala
@@ -126,4 +126,6 @@ object Util{
 
     transpose(xs, Nil).reverse
   }
-}
+
+  case class Location(fileName: String, lineNum: Int, fileContent: String)
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,4 +126,6 @@ object Util{ @@
         transpose(xs, Nil).reverse
       }
-    }
+      case class Location(fileName: String, lineNum: Int, fileContent: String)
+    }