Slightly improved import pos

scala · Apr 14, 2024 · 1688a6b · 1688a6b
1 parent c7a6971
commit 1688a6b
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 21 deletions.
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2731,7 +2731,7 @@ self =>
         case Nil => Nil
         case t :: rest =>
           // The first import should start at the position of the keyword.
-          t.setPos(t.pos.withStart(offset))
+          if (t.pos.isRange) t.setPos(t.pos.withStart(offset))
           t :: rest
       }
     }

diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -589,8 +589,10 @@ trait Namers extends MethodSynthesis {
           //       so don't warn for them. There is a corresponding special treatment
           //       in the shadowing rules in typedIdent to (scala/bug#7232). In any case,
           //       we shouldn't be emitting warnings for .java source files.
-          if (!context.unit.isJava)
-            checkNotRedundant(tree.pos withPoint fromPos, from, to)
+          if (!context.unit.isJava) {
+            val at = if (tree.pos.isRange) tree.pos.withPoint(fromPos) else tree.pos
+            checkNotRedundant(at, from, to)
+          }
         }
       }
       selectors.foreach(checkSelector)

diff --git a/src/reflect/scala/reflect/internal/util/Position.scala b/src/reflect/scala/reflect/internal/util/Position.scala
@@ -40,7 +40,8 @@ object Position {
     if (pos.isRange) {
       import pos.{pos => _, _}
       assert(start <= end, s"bad position: ${pos.show}")
-      //assert(start <= point && point < end, s"bad position: point $point out of range $start..$end: ${pos.show}")
+      //assert(start <= point && point <= end, s"bad position: point $point out of range $start..$end: ${pos.show}")
+      //assert(start <= point && point <= end, s"bad position: point $point out of range $start..$end: ${pos.show}\n${pos.lineContent}\n${pos.lineCaret}")
     }
     pos
   }

diff --git a/test/files/run/interop_typetags_are_manifests.scala b/test/files/run/interop_typetags_are_manifests.scala
@@ -1,5 +1,3 @@
-// scalac: -Yrangepos:false
-//
 import scala.reflect.runtime.universe._
 import scala.reflect.ClassTag
 

diff --git a/test/files/run/macro-openmacros.check b/test/files/run/macro-openmacros.check
@@ -1,3 +1,3 @@
-List(MacroContext(foo@source-Test_2.scala,line-3,offset=63 +0))
-List(MacroContext(foo@source-Test_2.scala,line-3,offset=63 +1), MacroContext(foo@source-Test_2.scala,line-3,offset=63 +0))
-List(MacroContext(foo@source-Test_2.scala,line-3,offset=63 +2), MacroContext(foo@source-Test_2.scala,line-3,offset=63 +1), MacroContext(foo@source-Test_2.scala,line-3,offset=63 +0))
+List(MacroContext(foo@RangePosition(Test_2.scala, 28, 35, 38) +0))
+List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@RangePosition(Test_2.scala, 28, 35, 38) +0))
+List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +2), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@RangePosition(Test_2.scala, 28, 35, 38) +0))
diff --git a/test/files/run/macro-openmacros/Impls_Macros_1.scala b/test/files/run/macro-openmacros/Impls_Macros_1.scala
@@ -1,4 +1,3 @@
-// scalac: -Yrangepos:false
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 import scala.util.Properties.isWin

diff --git a/test/files/run/macro-openmacros/Test_2.scala b/test/files/run/macro-openmacros/Test_2.scala
@@ -1,4 +1,3 @@
-// scalac: -Yrangepos:false
 object Test extends App {
   Macros.foo
 }
diff --git a/test/files/run/macro-parse-position.check b/test/files/run/macro-parse-position.check
@@ -1,5 +1,5 @@
 false
-source-<macro>,line-1,offset=4
+RangePosition(<macro>, 0, 4, 7)
 8
 foo bar
 
diff --git a/test/files/run/macro-parse-position/Impls_Macros_1.scala b/test/files/run/macro-parse-position/Impls_Macros_1.scala
@@ -1,4 +1,3 @@
-// scalac: -Yrangepos:false
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 

diff --git a/test/files/run/macro-parse-position/Test_2.scala b/test/files/run/macro-parse-position/Test_2.scala
@@ -1,4 +1,3 @@
-// scalac: -Yrangepos:false
 object Test extends App {
   println(Macros.foo)
 }
diff --git a/test/files/run/macroPlugins-typedMacroBody/Macros_2.scala b/test/files/run/macroPlugins-typedMacroBody/Macros_2.scala
@@ -1,4 +1,4 @@
-// scalac: -Xplugin:. -Yrangepos:false
+//> using options -Xplugin:.
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 

diff --git a/test/files/run/macroPlugins-typedMacroBody/Plugin_1.scala b/test/files/run/macroPlugins-typedMacroBody/Plugin_1.scala
@@ -1,4 +1,3 @@
-// scalac: -Yrangepos:false
 package typedMacroBody
 
 import scala.tools.nsc.Global

diff --git a/test/files/run/macroPlugins-typedMacroBody/Test_3.scala b/test/files/run/macroPlugins-typedMacroBody/Test_3.scala
@@ -1,4 +1,3 @@
-// scalac: -Yrangepos:false
 object Test extends App {
   Macros.foo1
   Macros.foo2

diff --git a/test/files/run/t6663.scala b/test/files/run/t6663.scala
@@ -1,5 +1,3 @@
-// scalac: -Yrangepos:false
-//
 import language.dynamics
 
 class C(v: Any) extends Dynamic {

diff --git a/test/files/run/t6731.scala b/test/files/run/t6731.scala
@@ -1,5 +1,3 @@
-// scalac: -Yrangepos:false -deprecation
-//
 import scala.language.dynamics
 import scala.reflect.{ ClassTag, classTag }