fix(compiler): Incorrect focus on error [LNG-274] (#959)

.scalafmt.conf

@@ -62,9 +62,9 @@ runner {
   }
 }
 
-rewrite {
-  rules = [
-    SortImports
-  ]
-}
+rewrite.rules = [Imports]
+rewrite.imports.sort = ascii
+rewrite.imports.groups = [
+  ["aqua\\..*"]
+]
 #runner.dialect = scala3

aqua-src/antithesis.aqua

@@ -1,6 +1,2 @@
-alias Troll: u32
-
-func test() -> i8:
-  MyAbility = Troll(f = "sf")
-
-  <- 42
+func arr(strs: []string) -> []string
+  <- strs

io/src/main/scala/aqua/Rendering.scala

@@ -1,17 +1,14 @@
 package aqua
 
-import aqua.compiler.AquaError.{ParserError as AquaParserError, *}
 import aqua.compiler.*
+import aqua.compiler.AquaError.{ParserError as AquaParserError, *}
 import aqua.files.FileModuleId
 import aqua.io.AquaFileError
 import aqua.parser.lift.{FileSpan, Span}
 import aqua.parser.{ArrowReturnError, BlockIndentError, LexerError, ParserError}
 import aqua.semantics.{HeaderError, RulesViolated, SemanticWarning, WrongAST}
 
-import cats.parse.LocationMap
-import cats.parse.Parser.Expectation
-import cats.parse.Parser.Expectation.*
-import cats.{Eval, Show}
+import cats.Show
 
 object Rendering {
 

io/src/test/scala/aqua/RenderingSpec.scala

@@ -0,0 +1,35 @@
+package aqua
+
+import aqua.Rendering.given
+import aqua.compiler.AquaError
+import aqua.files.FileModuleId
+import aqua.io.AquaFileError
+import aqua.parser.LexerError
+import aqua.parser.lift.{FileSpan, Span}
+
+import cats.Eval
+import cats.data.NonEmptyList
+import cats.parse.Parser.Expectation.InRange
+import cats.parse.{LocationMap, Parser}
+import cats.syntax.show.*
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.{Inside, Inspectors}
+
+class RenderingSpec extends AnyFlatSpec with Matchers with Inside with Inspectors {
+
+  it should "render end of a string properly" in {
+    val script =
+      """func arr(strs: []string) -> []string
+        |  <- strs""".stripMargin
+
+    val error = Parser.Error(8, NonEmptyList.one(InRange(36, ':', ':')))
+    val fileSpan = FileSpan("file", Eval.now(LocationMap(script)), Span(8, 9))
+
+
+    val result: AquaError[FileModuleId, AquaFileError, FileSpan.F] =
+      AquaError.ParserError(LexerError((fileSpan, error)))
+
+    result.show should include("Syntax error: file:1:37")
+  }
+}

parser/src/main/scala/aqua/parser/Parser.scala

@@ -1,21 +1,17 @@
 package aqua.parser
 
-import aqua.parser.Ast.Tree
-import aqua.parser.{Ast, LexerError, ParserError}
 import aqua.parser.expr.RootExpr
 import aqua.parser.head.HeadExpr
-import aqua.parser.lexer.Token
 import aqua.parser.lift.LiftParser.LiftErrorOps
-import aqua.parser.lift.{FileSpan, LiftParser, Span}
+import aqua.parser.lift.Span.S
+import aqua.parser.lift.{LiftParser, Span}
+
 import cats.data.{Validated, ValidatedNec}
-import cats.parse.{LocationMap, Parser as P, Parser0 as P0}
-import cats.{~>, Comonad, Eval, Id}
+import cats.parse.{Parser as P, Parser0 as P0}
+import cats.{Comonad, ~>}
 
 object Parser extends scribe.Logging {
-
-  import Span.spanLiftParser
-  lazy val spanParser = parserSchema
-  import LiftParser.Implicits.idLiftParser
+  lazy val spanParser: P0[ValidatedNec[ParserError[S], Ast[S]]] = parserSchema
 
   def parserSchema: P0[ValidatedNec[ParserError[Span.S], Ast[Span.S]]] = {
     logger.trace("creating schema...")

parser/src/main/scala/aqua/parser/lift/Span.scala

@@ -1,8 +1,7 @@
 package aqua.parser.lift
 
-import cats.data.NonEmptyList
-import cats.parse.{LocationMap, Parser as P, Parser0}
-import cats.{Comonad, Eval}
+import cats.Comonad
+import cats.parse.{LocationMap, Parser0, Parser as P}
 
 import scala.language.implicitConversions
 
@@ -51,11 +50,14 @@ object Span {
     str: String,
     idx: Int,
     len: Int
-  ): FocusedLine = FocusedLine(
-    str.substring(0, idx),
-    str.substring(idx, idx + len),
-    str.substring(idx + len)
-  )
+  ): FocusedLine = {
+    val end = idx + len
+    FocusedLine(
+      str.slice(0, idx),
+      str.slice(idx, end),
+      str.slice(end, str.length)
+    )
+  }
 
   final case class NumberedLine[T](
     number: Int,

parser/src/test/scala/aqua/parser/FuncExprSpec.scala

@@ -4,28 +4,24 @@ import aqua.AquaSpec
 import aqua.parser.expr.*
 import aqua.parser.expr.func.*
 import aqua.parser.lexer.*
-import aqua.parser.lift.LiftParser.Implicits.idLiftParser
 import aqua.parser.lift.Span
-import aqua.parser.lift.Span.{P0ToSpan, PToSpan}
 import aqua.types.ScalarType.*
 
-import cats.Id
-import cats.data.{Chain, NonEmptyList}
+import cats.{Eval, Id}
 import cats.data.Chain.*
+import cats.data.Validated.{Invalid, Valid}
+import cats.data.{Chain, NonEmptyList}
 import cats.free.Cofree
 import cats.syntax.foldable.*
-import cats.data.Validated.{Invalid, Valid}
 import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.{Inside, Inspectors}
 import org.scalatest.matchers.should.Matchers
-import cats.~>
-import cats.Eval
+import org.scalatest.{Inside, Inspectors}
 
 import scala.collection.mutable
 import scala.language.implicitConversions
 
 class FuncExprSpec extends AnyFlatSpec with Matchers with Inside with Inspectors with AquaSpec {
-  import AquaSpec.{given, *}
+  import AquaSpec.{*, given}
 
   private val parser = Parser.spanParser