Swap over script @main and Ammonite main argument parsing over to htt…

…ps://github.com/lihaoyi/mainargs (#1126) This brings with it slight incompatibilities that arise from the cleaned up API, but lets us delete large swathes of boilerplate code that are copy-pasted between this and other repositories I maintain
com-lihaoyi · Nov 22, 2020 · 0833981 · 0833981
1 parent 4bd225e
commit 0833981
Show file tree

Hide file tree

Showing 21 changed files with 239 additions and 1,224 deletions.
diff --git a/amm/interp/src/main/scala/ammonite/interp/AmmonitePlugin.scala b/amm/interp/src/main/scala/ammonite/interp/AmmonitePlugin.scala
@@ -316,15 +316,26 @@ object LineNumberModifier {
         // relaxing the aggressive validation.
         val newPos = tree.pos match {
           case s : TransparentPosition if s.start > topWrapperLen =>
-              new TransparentPosition(trimmedSource, s.start, s.point - topWrapperLen, s.end)
+              new TransparentPosition(
+                trimmedSource,
+                s.start - topWrapperLen,
+                s.point - topWrapperLen,
+                s.end - topWrapperLen
+              )
           case s: RangePosition if s.start > topWrapperLen =>
-              new RangePosition(trimmedSource, s.start, s.point - topWrapperLen, s.end)
+              new RangePosition(
+                trimmedSource,
+                s.start - topWrapperLen,
+                s.point - topWrapperLen,
+                s.end - topWrapperLen
+              )
           case s: OffsetPosition if s.start > topWrapperLen =>
               new OffsetPosition(trimmedSource, s.point - topWrapperLen)
           case s => s
 
         }
         transformedTree.pos = newPos
+
         transformedTree
       }
 

diff --git a/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala b/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala
@@ -716,8 +716,8 @@ object Interpreter{
     ImportData("ammonite.runtime.tools.{browse, grep, time}"),
     ImportData("ammonite.runtime.tools.tail", importType = ImportData.TermType),
     ImportData("ammonite.repl.tools.{desugar, source}"),
-    ImportData("ammonite.main.Router.{doc, main}"),
-    ImportData("ammonite.repl.tools.Util.pathScoptRead")
+    ImportData("mainargs.{arg, main}"),
+    ImportData("ammonite.repl.tools.Util.PathRead")
   )