incorporate review

Author: martijnhoekstra

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -1665,7 +1665,7 @@ object desugar {
           case t => t
         }
         // This is a deliberate departure from scalac, where StringContext is not rooted (See #4732)
-        Apply(Select(Apply(scalaDot(nme.StringContext), strs), id), elems)
+        Apply(Select(Apply(scalaDot(nme.StringContext).withSpan(tree.span), strs), id), elems)
       case PostfixOp(t, op) =>
         if ((ctx.mode is Mode.Type) && !isBackquoted(op) && op.name == tpnme.raw.STAR) {
           val seqType = if (ctx.compilationUnit.isJava) defn.ArrayType else defn.SeqType

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1246,15 +1246,11 @@ object Parsers {
             })
 
       var offsetCorrection = if isTripleQuoted then 3 else 1
-      def offset = {
-        val result = in.offset + offsetCorrection
-        offsetCorrection = 0
-        result
-      }
       while (in.token == STRINGPART)
-        nextSegment(offset)
+        nextSegment(in.offset + offsetCorrection)
+        offsetCorrection = 0
       if (in.token == STRINGLIT)
-        segmentBuf += literal(inPattern = inPattern, negOffset = offset, inStringInterpolation = true)
+        segmentBuf += literal(inPattern = inPattern, negOffset = in.offset + offsetCorrection, inStringInterpolation = true)
 
       InterpolatedString(interpolator, segmentBuf.toList)
     }

compiler/test-resources/repl/i6676

@@ -7,8 +7,8 @@ scala> xml"
   |     ';' expected, but eof found
 scala> xml""
 1 | xml""
-  |     ^
-  |     value xml is not a member of StringContext
+  | ^^^^^
+  | value xml is not a member of StringContext
 scala> xml"""
 1 | xml"""
   |    ^