Tried fixing tests again

Author: Alexiril

stubs/antlr4-python3-runtime/antlr4/BufferedTokenStream.pyi

@@ -1,7 +1,9 @@
 from antlr4.error.Errors import IllegalStateException as IllegalStateException
-from antlr4.Lexer import Lexer, TokenSource
+from antlr4.Lexer import Lexer as ActualLexer, TokenSource
 from antlr4.Token import Token as Token
 
+Lexer: None
+
 class TokenStream: ...
 
 class BufferedTokenStream(TokenStream):
@@ -10,7 +12,7 @@ class BufferedTokenStream(TokenStream):
     tokens: list[Token]
     index: int
     fetchedEOF: bool
-    def __init__(self, tokenSource: Lexer) -> None: ...
+    def __init__(self, tokenSource: ActualLexer | None) -> None: ...
     def mark(self) -> int: ...
     def release(self, marker: int) -> None: ...
     def reset(self) -> None: ...
@@ -26,7 +28,7 @@ class BufferedTokenStream(TokenStream):
     def adjustSeekIndex(self, i: int) -> int: ...
     def lazyInit(self) -> None: ...
     def setup(self) -> None: ...
-    def setTokenSource(self, tokenSource: Lexer) -> None: ...
+    def setTokenSource(self, tokenSource: ActualLexer | None) -> None: ...
     def nextTokenOnChannel(self, i: int, channel: int) -> int: ...
     def previousTokenOnChannel(self, i: int, channel: int) -> int: ...
     def getHiddenTokensToRight(self, tokenIndex: int, channel: int = -1) -> list[Token] | None: ...

stubs/antlr4-python3-runtime/antlr4/ParserRuleContext.pyi

@@ -25,24 +25,24 @@ class ParserRuleContext(RuleContext):
     def copyFrom(self, ctx: ParserRuleContext) -> None: ...
     def enterRule(self, listener: ParseTreeListener) -> None: ...
     def exitRule(self, listener: ParseTreeListener) -> None: ...
-    def addChild(self, child: ParseTreeT) -> ParseTreeT: ...
+    def addChild(self, child: _ParseTreeT) -> _ParseTreeT: ...
     def removeLastChild(self) -> None: ...
     def addTokenNode(self, token: Token) -> TerminalNodeImpl: ...
     def addErrorNode(self, badToken: Token) -> ErrorNodeImpl: ...
-    def getChild(self, i: int, ttype: type[GenericType] | None = None) -> GenericType | None: ...
+    def getChild(self, i: int, ttype: type[_GenericType] | None = None) -> _GenericType | None: ...
     def getChildren(
         self, predicate: Callable[[ParseTree | TerminalNode], bool] | None = None
     ) -> Generator[ParseTree | TerminalNode, None, None]: ...
     def getToken(self, ttype: int, i: int) -> TerminalNode | None: ...
     def getTokens(self, ttype: int) -> list[TerminalNode]: ...
-    def getTypedRuleContext(self, ctxType: type[ParserRuleContextT], i: int) -> ParserRuleContextT | None: ...
-    def getTypedRuleContexts(self, ctxType: type[ParserRuleContextT]) -> list[ParserRuleContextT]: ...
+    def getTypedRuleContext(self, ctxType: type[_ParserRuleContextT], i: int) -> _ParserRuleContextT | None: ...
+    def getTypedRuleContexts(self, ctxType: type[_ParserRuleContextT]) -> list[_ParserRuleContextT]: ...
     def getChildCount(self) -> int: ...
     def getSourceInterval(self) -> tuple[int | None, int | None]: ...
 
-GenericType = TypeVar("GenericType", bound=type)
-ParseTreeT = TypeVar("ParseTreeT", bound=ParseTree)
-ParserRuleContextT = TypeVar("ParserRuleContextT", bound=ParserRuleContext)
+_GenericType = TypeVar("_GenericType", bound=type)
+_ParseTreeT = TypeVar("_ParseTreeT", bound=ParseTree)
+_ParserRuleContextT = TypeVar("_ParserRuleContextT", bound=ParserRuleContext)
 
 class InterpreterRuleContext(ParserRuleContext):
     ruleIndex: int

stubs/antlr4-python3-runtime/antlr4/RuleContext.pyi

@@ -2,10 +2,12 @@ from collections.abc import Generator
 from typing import Any, Literal
 from typing_extensions import Self
 
-from antlr4.Recognizer import Recognizer as Parser
+from antlr4.Recognizer import Recognizer
 from antlr4.tree.Tree import INVALID_INTERVAL as INVALID_INTERVAL, ParseTreeVisitor as ParseTreeVisitor, RuleNode as RuleNode
 from antlr4.tree.Trees import Trees as Trees
 
+Parser: None
+
 class RuleContext(RuleNode):
     __slots__ = ("parentCtx", "invokingState")
     EMPTY: RuleContext | None
@@ -25,5 +27,5 @@ class RuleContext(RuleNode):
     def getChildCount(self) -> int: ...
     def getChildren(self) -> Generator[Any, None, None]: ...
     def accept(self, visitor: ParseTreeVisitor) -> None: ...
-    def toStringTree(self, ruleNames: list[str] | None = None, recog: Parser | None = None) -> str: ...
+    def toStringTree(self, ruleNames: list[str] | None = None, recog: Recognizer | None = None) -> str: ...
     def toString(self, ruleNames: list[str], stop: RuleContext) -> str: ...

stubs/antlr4-python3-runtime/antlr4/tree/Tree.pyi

@@ -13,15 +13,15 @@ class RuleNode(ParseTree): ...
 class TerminalNode(ParseTree): ...
 class ErrorNode(TerminalNode): ...
 
-GenericType = TypeVar("GenericType", bound=type)
+_GenericType = TypeVar("_GenericType", bound=type)
 
 class ParseTreeVisitor:
     def visit(self, tree: Tree) -> None: ...
     def visitChildren(self, node) -> None: ...
     def visitTerminal(self, node: TerminalNode) -> None: ...
     def visitErrorNode(self, node: ErrorNode) -> None: ...
     def defaultResult(self) -> None: ...
-    def aggregateResult(self, aggregate: Incomplete, nextResult: GenericType) -> GenericType: ...
+    def aggregateResult(self, aggregate: Incomplete, nextResult: _GenericType) -> _GenericType: ...
     def shouldVisitNextChild(self, node: Incomplete, currentResult: Incomplete) -> Literal[True]: ...
 
 class ParseTreeListener: