Add col_offset parameter to py_compile`.

1. It makes `ast.increment_lineno` in the same pass.
2. It correctly sets `end_lineno/end_col_offset`.
3. It can strip `end_...`s for generated AST.

renpy/__init__.py

@@ -253,6 +253,7 @@ name_blacklist = {
     "renpy.exports.sdl_dll",
     "renpy.sl2.slast.serial",
     "renpy.gl2.gl2draw.default_position",
+    "renpy.lexer._python_updatecache",
     }
 
 class Backup(_object):

renpy/common/_errorhandling.rpym

@@ -509,50 +509,69 @@ init python:
 
         return "\n".join(rv)
 
-    def __format_parse_errors(s):
+    def __format_parse_errors(errors: list[str]):
+        """
+        Takes list of ParseError messages and transforms it
+        to string of sane length to be used as child of viewport.
+        """
+
         import re
 
-        rv = ""
+        rv = []
+        rv_len = 0
+        for error in errors:
+            lines = error.split("\n")
 
-        lines = s.split("\n")
-        lines = __limit_lines(lines)
-        len_lines = len(lines)
+            # Do not count first line in total to include those as much as
+            # possible.
+            rv.append(re.sub(
+                r'(File "(.*)", line (\d+))',
+                r'{a=edit:\3:\2}\1{/a}',
+                lines.pop(0)))
 
-        ln = 0
+            error_rv = []
+            error_len = 0
+            for line in lines:
+                # In case we have single insanely lengthy single error.
+                error_len += len(line)
+                if error_len > 65536:
+                    error_rv.clear()
+                    break
 
-        while ln < len_lines:
-            line = lines[ln]
-            ln += 1
+                if set(line.strip()) == {"^"}:
+                    idx = line.find("^")
+                    count = line.count("^", idx)
 
-            if ln < len_lines and lines[ln].endswith("^"):
-                highlight = len(lines[ln]) - 1
-                ln += 1
-            else:
-                highlight = -1
+                    prev_line = error_rv[-1]
 
-            pos = 0
+                    line = prev_line[:idx]
 
-            for c in line:
-                if pos == highlight:
-                    rv += u"{color=#c00}\u2192{/color}"
-                    highlight = -1
+                    if count == 1:
+                        if len(prev_line) < idx + count:
+                            mark = "\u2190"
+                        else:
+                            mark = "\u2192"
+                            count = 0
+                    else:
+                        mark = prev_line[idx:idx + count]
+                    line += "{b}{color=#a00}"
+                    line += mark
+                    line += "{/color}{/b}"
+                    line += prev_line[idx + count:]
 
-                pos += 1
+                    error_rv[-1] = line
+                    continue
 
-                if c == "{":
-                    rv += "{{"
-                else:
-                    rv += c
+                error_rv.append(line)
 
-            if highlight > 0:
-                rv += u"{color=#c00}\u2190{/color}"
+            rv_len += error_len
+            if rv_len > 1048576:
+                break
 
-            rv += "\n"
+            rv.extend(error_rv)
+            rv.append("")
 
-
-        rv = re.sub(r'(File "(.*)", line (\d+))', r'{a=edit:\3:\2}\1{/a}', rv)
-
-        return rv
+        return "\n".join(rv)
 
     class _EditFile(Action):
         def __init__(self, filename, line=1):
@@ -778,7 +797,7 @@ screen _exception:
     key "console" action __EnterConsole()
 
 # The screen that is used for error handling.
-screen _parse_errors:
+screen _parse_errors(errors, error_fn, reload_action):
     modal True
     layer config.interface_layer
     zorder 1090

renpy/display/error.py

@@ -22,7 +22,7 @@
 # This file contains code to handle GUI-based error reporting.
 
 from __future__ import division, absolute_import, with_statement, print_function, unicode_literals
-from renpy.compat import PY2, basestring, bchr, bord, chr, open, pystr, range, round, str, tobytes, unicode # *
+from renpy.compat import PY2, basestring, bchr, bord, chr, open, pystr, range, round, str, tobytes, unicode  # *
 
 
 import os
@@ -143,7 +143,7 @@ def report_exception(short, full, traceback_fn):
             reload_action=reload_action,
             ignore_action=ignore_action,
             traceback_fn=traceback_fn,
-            )
+        )
 
         renpy.display.im.ignored_images |= renpy.display.im.images_to_ignore
 
@@ -162,7 +162,7 @@ def report_exception(short, full, traceback_fn):
         raise
 
 
-def report_parse_errors(errors, error_fn):
+def report_parse_errors(errors: list[str], error_fn: str) -> bool:
     """
     Reports an exception to the user. Returns True if the exception should
     be raised by the normal reporting mechanisms. Otherwise, should raise
@@ -174,7 +174,7 @@ def report_parse_errors(errors, error_fn):
 
     error_dump()
 
-    if renpy.game.args.command != "run": # @UndefinedVariable
+    if renpy.game.args.command != "run":
         return True
 
     if "RENPY_SIMPLE_EXCEPTIONS" in os.environ:
@@ -199,7 +199,7 @@ def report_parse_errors(errors, error_fn):
             reload_action=reload_action,
             errors=errors,
             error_fn=error_fn,
-            )
+        )
 
     except renpy.game.CONTROL_EXCEPTIONS:
         raise
@@ -208,3 +208,5 @@ def report_parse_errors(errors, error_fn):
         renpy.display.log.write("While handling exception:")
         renpy.display.log.exception()
         raise
+
+    return False

renpy/lexer.py

@@ -23,114 +23,141 @@
 from __future__ import division, absolute_import, with_statement, print_function, unicode_literals # type: ignore
 from renpy.compat import PY2, basestring, bchr, bord, chr, open, pystr, range, round, str, tobytes, unicode # *
 
+from typing import Any
 
 import codecs
 import re
 import sys
 import os
 import time
+import linecache
 import contextlib
 
 import renpy
 
 from renpy.lexersupport import match_logical_word
 
-# The filename that's in the line text cache.
-line_text_filename = ""
 
-# The content of the line text cache.
-line_text_cache = [ ]
+_python_updatecache = linecache.updatecache
 
 
-def get_line_text(filename, lineno):
+def _updatecache(filename: str, module_globals: dict[str, Any] | None = None) -> list[str]:
     """
-    Gets the text of a line, in a best-effort way, for debugging purposes. May
-    return just a newline, if the line doesn't exist.
+    Monkeypatch internal linecache.updatecache to work around RenPy python code
+    being in different files even in the same namespace. Assume filename is one
+    of '_ren.py', '.rpy' or '.rpym'.
+
+    This is needed because a lot of Python modules (namely traceback) assume
+    that the compiled python code is always comes from the python file and uses
+    linecache to get the source code, which tries to use PEP302 loader, which
+    for RenPy python code points to renpy.minstore.
     """
 
-    global line_text_filename
-    global line_text_cache
-
-    import linecache
-    full_filename = renpy.exports.unelide_filename(filename)
-
-
-    if full_filename != line_text_filename:
-
-        line_text_filename = full_filename
+    if filename.endswith(("_ren.py", ".rpy", ".rpym")):
+        # Assume filename also relative to basedir or renpy_base.
+        full_fn = renpy.lexer.unelide_filename(filename)
+        # If we can't find absolute path that way, assume we are
+        # in build, so we can't show source.
+        if not (os.path.isabs(full_fn) and os.path.exists(full_fn)):
+            linecache.cache.pop(filename, None)
+            return []
 
         try:
-
-            with open(full_filename, "rb") as f:
+            with open(full_fn, "rb") as f:
                 data = f.read().decode("utf-8", "python_strict")
 
-            if full_filename.endswith("_ren.py"):
+            if full_fn.endswith("_ren.py"):
                 data = ren_py_to_rpy(data, None)
 
             data += "\n\n"
 
-            line_text_cache = data.split("\n")
+            lines = data.split("\n")
+            if lines and lines[0].startswith("\ufeff"):
+                lines[0] = lines[0][1:]
+
+            lines = [line.removesuffix("\r") + "\n" for line in lines]
+
+            stat = os.stat(full_fn)
+            linecache.cache[filename] = stat.st_size, stat.st_mtime, lines, full_fn
+            return lines
 
         except Exception:
-            line_text_cache = [ ]
+            return []
 
-    if lineno <= len(line_text_cache):
-        return line_text_cache[lineno - 1] + "\n"
-    else:
-        return "\n"
+    return _python_updatecache(filename, module_globals)
 
 
-class ParseError(Exception):
+linecache.updatecache = _updatecache
 
-    def __init__(self, filename, number, msg, line=None, pos=None, first=False):
-        message = u"File \"%s\", line %d: %s" % (unicode_filename(filename), number, msg)
 
-        if line:
-            if isinstance(line, list):
-                line = "".join(line)
+class ParseError(SyntaxError):
+    """
+    Special exception type for syntax errors in Ren'Py.
+    This exception includes syntax errors of Python code, converted to
+    appropriate report style, and Ren'Py own syntax errors in user script.
+    """
 
-            lines = line.split('\n')
+    _message: str | None = None
 
-            if len(lines) > 1:
-                open_string = None
-                i = 0
+    def __init__(
+        self,
+        message: str,
+        filename: str,
+        lineno: int,
+        offset: int | None = None,
+        text: str | None = None,
+        end_lineno: int | None = None,
+        end_offset: int | None = None,
+    ):
+        super().__init__(message, (
+            unicode_filename(filename),
+            lineno, offset,
+            text,
+            end_lineno, end_offset))
 
-                while i < len(lines[0]):
-                    c = lines[0][i]
+    @property
+    def message(self) -> str:
+        """
+        Fully formatted message of the error close to the result of
+        `traceback.print_exception_only`.
+        """
+        if self._message is None:
+            message = f'File "{self.filename}", line {self.lineno}: {self.msg}'
+            if self.text is not None:
+                # Neither Python nor this class does not support multiline syntax error code.
+                # Just strip the first line of provided code.
+                text = self.text.split("\n")[0]
 
-                    if c == "\\":
-                        i += 1
-                    elif c == open_string:
-                        open_string = None
-                    elif open_string:
-                        pass
-                    elif c == '`' or c == '\'' or c == '"':
-                        open_string = c
+                # Remove ending escape chars, so we can render it.
+                text = text.rstrip()
 
-                    i += 1
+                # And also replace any escape chars at the start with an indent.
+                message += f'\n    {text.lstrip()}'
 
-                if open_string:
-                    message += "\n(Perhaps you left out a %s at the end of the first line.)" % open_string
+                if self.offset is not None:
+                    offset = self.offset
 
-            for l in lines:
-                message += "\n    " + l
-
-                if pos is not None:
-                    if pos <= len(l):
-                        message += "\n    " + " " * pos + "^"
-                        pos = None
+                    # Fallback to single caret for cases end_offset is before offset.
+                    if self.end_offset is None or self.end_offset <= offset:
+                        end_offset = offset + 1
                     else:
-                        pos -= len(l)
+                        end_offset = self.end_offset
 
-                if first:
-                    break
+                    left_spaces = len(text) - len(text.lstrip())
+                    offset -= left_spaces
+                    end_offset -= left_spaces
 
-        self.message = message
+                    if offset >= 1:
+                        caret_space = ' ' * (offset - 1)
+                        carets = '^' * (end_offset - offset)
+                        message += f"\n    {caret_space}{carets}"
 
-        Exception.__init__(self, message)
+            for note in getattr(self, "__notes__", ()):
+                message += f"\n{note}"
 
-    def __unicode__(self):
-        return self.message
+            self._message = message
+
+        return self._message
 
     def defer(self, queue):
         renpy.parser.deferred_parse_errors[queue].append(self.message)
@@ -356,7 +383,8 @@ def list_logical_lines(filename, filedata=None, linenumber=1, add_lines=False):
             c = data[pos]
 
             if c == u'\t':
-                raise ParseError(filename, number, "Tab characters are not allowed in Ren'Py scripts.")
+                raise ParseError("Tab characters are not allowed in Ren'Py scripts.",
+                                 filename, number)
 
             if c == u'\n' and not parendepth:
 
@@ -496,10 +524,19 @@ def list_logical_lines(filename, filedata=None, linenumber=1, add_lines=False):
             pos = end
 
             if (pos - startpos) > 65536:
-                raise ParseError(filename, start_number, "Overly long logical line. (Check strings and parenthesis.)", line=line, first=True)
+                err = ParseError(
+                    "Overly long logical line.",
+                    filename, start_number,
+                    text="".join(line))
+                err.add_note("Check strings and parenthesis.")
+                raise err
 
     if line:
-        raise ParseError(filename, start_number, "is not terminated with a newline. (Check strings and parenthesis.)", line=line, first=True)
+        err = ParseError("is not terminated with a newline.",
+                         filename, start_number,
+                         text="".join(line))
+        err.add_note("Check strings and parenthesis.")
+        raise err
 
     return rv
 
@@ -547,7 +584,9 @@ def gll_core(lines, i, min_depth):
             depth = line_depth
 
         if depth != line_depth:
-            raise ParseError(filename, number, "Indentation mismatch.")
+            raise ParseError(
+                "Indentation mismatch.",
+                filename, number, text=text)
 
         # Advance to the next line.
         i += 1
@@ -573,7 +612,9 @@ def group_logical_lines(lines):
         filename, number, text = lines[0]
 
         if depth_split(text)[0] != 0:
-            raise ParseError(filename, number, "Unexpected indentation at start of file.")
+            raise ParseError(
+                "Unexpected indentation at start of file.",
+                filename, number, text=text)
 
     return gll_core(lines, 0, 0)[0]
 
@@ -822,7 +863,12 @@ class Lexer(object):
         if (self.line == -1) and self.block:
             self.filename, self.number, self.text, self.subblock = self.block[0]
 
-        raise ParseError(self.filename, self.number, msg, self.text, self.pos)
+        raise ParseError(
+            msg,
+            self.filename,
+            self.number,
+            self.pos,
+            self.text)
 
     def deferred_error(self, queue, msg):
         """
@@ -836,7 +882,10 @@ class Lexer(object):
         if (self.line == -1) and self.block:
             self.filename, self.number, self.text, self.subblock = self.block[0]
 
-        ParseError(self.filename, self.number, msg, self.text, self.pos).defer(queue)
+        ParseError(
+            msg, self.filename,
+            self.number, self.pos + 1,
+            self.text).defer(queue)
 
     def eol(self):
         """
@@ -1582,7 +1631,7 @@ class Lexer(object):
         return sp
 
 
-def ren_py_to_rpy(text, filename):
+def ren_py_to_rpy(text: str, filename: str | None) -> str:
     """
     Transforms an _ren.py file into the equivalent .rpy file. This should retain line numbers.
 
@@ -1660,8 +1709,9 @@ def ren_py_to_rpy(text, filename):
             raise Exception('In {!r}, there are no """renpy blocks, so every line is ignored.'.format(filename))
 
         if state == RENPY:
-            raise Exception('In {!r}, there is a """renpy block at line {} that is not terminated by """.'.format(filename,
-                                                                                                                open_linenumber))
+            raise Exception(
+                'In {!r}, there is a """renpy block at line {} that is not terminated by """.'.format(
+                    filename, open_linenumber))
 
     rv = "\n".join(result)
 

renpy/parser.py

@@ -43,7 +43,6 @@ from renpy.lexer import (
     munge_filename,
     elide_filename,
     unelide_filename,
-    get_line_text,
     SubParse,
 )
 
@@ -1769,8 +1768,10 @@ def report_parse_errors():
     full_text = ""
 
     f, error_fn = renpy.error.open_error_file("errors.txt", "w")
+
+    screen_parse_errors = []
     with f:
-        f.write("\ufeff") # BOM
+        f.write("\ufeff")  # BOM
 
         print("I'm sorry, but errors were detected in your script. Please correct the", file=f)
         print("errors listed below, and try again.", file=f)
@@ -1787,6 +1788,8 @@ def report_parse_errors():
             print("", file=f)
             print(i, file=f)
 
+            screen_parse_errors.append(i)
+
             try:
                 print("")
                 print(i)
@@ -1797,7 +1800,7 @@ def report_parse_errors():
         print("Ren'Py Version:", renpy.version, file=f)
         print(str(time.ctime()), file=f)
 
-    renpy.display.error.report_parse_errors(full_text, error_fn)
+    renpy.display.error.report_parse_errors(screen_parse_errors, error_fn)
 
     try:
         if renpy.game.args.command == "run" or renpy.game.args.errors_in_editor: # type: ignore

renpy/python.py

@@ -26,7 +26,7 @@
 from __future__ import division, absolute_import, with_statement, print_function, unicode_literals
 from renpy.compat import PY2, basestring, bchr, bord, chr, open, pystr, range, round, str, tobytes, unicode # *
 
-from typing import Optional, Any
+from typing import Optional, Any, cast
 import contextlib
 
 # Import the python ast module, not ours.
@@ -876,35 +876,86 @@ py_compile_cache = { }
 old_py_compile_cache = { }
 
 
-def fix_locations(node, lineno, col_offset):
+def fix_locations(
+    node: ast.AST,
+    lineno_increment: int = 0,
+    col_offset: int = 0,
+    strip_ends: bool = False,
+    _parent_offset=(0, 0),
+    _first=True,
+):
     """
-    Assigns locations to the given node, and all of its children, adding
-    any missing line numbers and column offsets.
+    This function does `ast.increment_lineno`, `ast.fix_missing_locations`
+    and `[end_]col_offset` increments in one pass.
+
+    `lineno_increment`
+        Amount of lines to increment `lineno` by.
+
+    `col_offset`
+        0-indexed offset of source code. This should be used in case
+        source code have extra indent relative to compiled source.
+
+    `strip_ends`
+        If `True`, removes `end_lineno` and `end_col_offset`
+        so traceback does not render incorrect carets for given nodes tree.
     """
 
-    start = max(
-        (lineno, col_offset),
-        (getattr(node, "lineno", None) or 1, getattr(node, "col_offset", None) or 0)
-    )
+    if _first:
+        if not isinstance(node, (ast.Module, ast.Expression)):
+            raise ValueError(f"'fix_locations' called with unsupported top level node: {node}")
 
-    lineno, col_offset = start
+    # TypeIgnore is a special case where lineno is not an attribute
+    # but rather a field of the node itself.
+    if isinstance(node, ast.TypeIgnore):
+        node.lineno = getattr(node, 'lineno', 0) + lineno_increment
+        return
 
-    node.lineno = lineno
-    node.col_offset = col_offset
+    parent_lineno, parent_col_offset = _parent_offset
 
-    ends = [ start, (getattr(node, "end_lineno", None) or 1, getattr(node, "end_col_offset", None) or 0) ]
+    # lineno and col_offset must exist on every node.
+    # If there are none, we assume ast creator knows what they
+    # are doing and we can just assign to parent values.
+    if 'lineno' in node._attributes:
+        node = cast("ast.expr", node)
+        node.lineno = getattr(node, 'lineno', parent_lineno)
+        parent_lineno = node.lineno
+        node.lineno += lineno_increment
+
+    if 'col_offset' in node._attributes:
+        node = cast("ast.expr", node)
+        node.col_offset = getattr(node, 'col_offset', parent_col_offset)
+        parent_col_offset = node.col_offset
+        node.col_offset += col_offset
 
     for child in ast.iter_child_nodes(node):
-        fix_locations(child, lineno, col_offset)
-        ends.append((child.end_lineno, child.end_col_offset))
+        fix_locations(
+            child,
+            lineno_increment,
+            col_offset,
+            strip_ends,
+            (parent_lineno, parent_col_offset),
+            False)
 
-    end = max(ends)
+    # end_lineno and end_col_offset are optional, and we remove them if
+    # strip_ends is True (for generated code that doesn't have source).
+    if 'end_lineno' in node._attributes:
+        node = cast("ast.expr", node)
+        if strip_ends:
+            node.end_lineno = None
+        else:
+            end_lineno = getattr(node, 'end_lineno', None)
+            node.end_lineno = (end_lineno or parent_lineno) + lineno_increment
 
-    node.end_lineno = end[0]
-    node.end_col_offset = end[1]
+    if 'end_col_offset' in node._attributes:
+        node = cast("ast.expr", node)
+        if strip_ends:
+            node.end_col_offset = None
+        else:
+            end_col_offset = getattr(node, 'end_col_offset', None)
+            node.end_col_offset = (end_col_offset or parent_col_offset) + col_offset
 
 
-def quote_eval(s):
+def quote_eval(s: str):
     """
     Quotes a string for `eval`. This is necessary when it's in certain places,
     like as part of an argument string. We need to stick a single backslash
@@ -997,18 +1048,17 @@ def quote_eval(s):
 compile_filename = ""
 
 
-def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=True, py=None):
+def py_compile(source, mode, filename='<none>', lineno=1, col_offset=None, ast_node=False, cache=True, py=None):
     """
-    Compiles the given source code using the supplied codegenerator.
+    Compiles the given source code using the supplied code generator.
     Lists, List Comprehensions, and Dictionaries are wrapped when
     appropriate.
 
     `source`
-        The source code, as a either a string, pyexpr, or ast module
-        node.
+        The source code, as a either a string or PyExpr.
 
     `mode`
-        One of "exec" or "eval".
+        One of "exec", "hide" or "eval".
 
     `filename`
         The filename the source comes from. If a pyexpr is given, the
@@ -1016,7 +1066,12 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
 
     `lineno`
         The line number of the first line of source code. If a pyexpr is
-        given, the filename embedded in the pyexpr is used.
+        given, the lineno embedded in the pyexpr is used.
+
+    `col_offset`
+        If not None, the column offset of the first line of source code,
+        otherwise offset information is stripped from the source code.
+        If a pyexpr is given, the col_offset embedded in the pyexpr is used.
 
     `ast_node`
         Rather than returning compiled bytecode, returns the AST object
@@ -1029,9 +1084,6 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
     if ast_node:
         cache = False
 
-    if isinstance(source, ast.Module):
-        return compile(source, filename, mode)
-
     if isinstance(source, renpy.ast.PyExpr):
         filename = source.filename
         lineno = source.linenumber
@@ -1078,8 +1130,10 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
     if mode == "eval":
         source = quote_eval(source)
 
-    line_offset = lineno - 1
     compile_filename = filename
+    line_offset = lineno - 1
+    code_offset = col_offset or 0
+    strip_ends = col_offset is None
 
     try:
 
@@ -1093,13 +1147,25 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
 
         try:
             with save_warnings():
-                tree = compile(source, filename, py_mode, ast.PyCF_ONLY_AST | flags, 1)
+                # filename should not be a valid file name, so Python tokenizer
+                # function 'get_error_line_from_tokenizer_buffers' does not try
+                # to read from the file to get the size of the buffer of error
+                # line.
+                tree = compile(source, "<tree>", py_mode, ast.PyCF_ONLY_AST | flags, 1)
         except SyntaxError as orig_e:
+            # Set back filename to correct one.
+            # For what it worth, '_PyPegen_raise_error_known_location'
+            # fixes lineno, col_offset and end_col_offset, but not end_lineno.
+            # We don't use it, so whatever.
+            orig_e.filename = filename
+
+            # Inserting artificial tokens can broke locations.
+            strip_ends = True
 
             try:
                 fixed_source = renpy.compat.fixes.fix_tokens(source)
                 with save_warnings():
-                    tree = compile(fixed_source, filename, py_mode, ast.PyCF_ONLY_AST | flags, 1)
+                    tree = compile(fixed_source, "<tree>", py_mode, ast.PyCF_ONLY_AST | flags, 1)
             except Exception:
                 raise orig_e
 
@@ -1108,8 +1174,7 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
         if mode == "hide":
             wrap_hide(tree)
 
-        fix_locations(tree, 1, 0)
-        ast.increment_lineno(tree, lineno - 1)
+        fix_locations(tree, line_offset, code_offset, strip_ends)
 
         line_offset = 0
 
@@ -1122,7 +1187,8 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
         except SyntaxError as orig_e:
             try:
                 tree = renpy.compat.fixes.fix_ast(tree)
-                fix_locations(tree, 1, 0)
+                # Creating artificial nodes can broke locations.
+                fix_locations(tree, strip_ends=True)
                 with save_warnings():
                     rv = compile(tree, filename, py_mode, flags, 1)
             except Exception:

renpy/script.py

@@ -560,12 +560,13 @@ class Script(object):
                     if renpy.config.allow_duplicate_labels:
                         return
 
+                    import linecache
                     self.duplicate_labels.append(
                         u'The label {} is defined twice, at File "{}", line {}:\n{}and File "{}", line {}:\n{}'.format(
                             bad_name, old_node.filename, old_node.linenumber,
-                            renpy.lexer.get_line_text(old_node.filename, old_node.linenumber),
+                            linecache.getline(old_node.filename, old_node.linenumber),
                             bad_node.filename, bad_node.linenumber,
-                            renpy.lexer.get_line_text(bad_node.filename, bad_node.linenumber),
+                            linecache.getline(bad_node.filename, bad_node.linenumber),
                         ))
 
         self.update_bytecode()
@@ -1015,18 +1016,14 @@ class Script(object):
                         code = renpy.python.py_compile_eval_bytecode(i.source, filename=i.location[0], lineno=i.location[1], py=i.py)
 
                 except SyntaxError as e:
-
-                    text = e.text
-
-                    if text is None:
-                        text = ''
-
+                    assert e.filename is not None
+                    assert e.lineno is not None
                     pem = renpy.parser.ParseError(
-                        filename=e.filename,
-                        number=e.lineno,
-                        msg=e.msg,
-                        line=text,
-                        pos=e.offset)
+                        e.msg,
+                        e.filename,
+                        e.lineno, e.offset,
+                        e.text,
+                        e.end_lineno, e.end_offset)
 
                     renpy.parser.parse_errors.append(pem.message)
 

renpy/translation/__init__.py

@@ -198,10 +198,10 @@ class ScriptTranslator(object):
                     if n.identifier in self.default_translates:
                         old_node = self.default_translates[n.identifier]
 
-                        renpy.lexer.ParseError(n.filename, n.linenumber, "Line with id %s appears twice. The other line is %s:%d" % (
-                                    n.identifier,
-                                    old_node.filename, old_node.linenumber)
-                                    ).defer("duplicate_id")
+                        renpy.lexer.ParseError(
+                            f"Line with id {n.identifier} appears twice. "
+                            f"The other line is {old_node.filename}:{old_node.linenumber}",
+                            n.filename, n.linenumber,).defer("duplicate_id")
 
                     self.default_translates[n.identifier] = n
                     self.file_translates[filename].append((label, n))