Merge branch 'master' into stub-fix

.github/workflows/mypy.yml

@@ -16,4 +16,4 @@ jobs:
           python -m pip install --upgrade pip
           pip install mypy
       - name: Lint with mypy
-        run: mypy -m lark-stubs || true
+        run: mypy -m lark_stubs || true

lark/parsers/xearley.py

@@ -93,6 +93,7 @@ class Parser(BaseParser):
                 if token is not None:
                     token.end_line = text_line
                     token.end_column = text_column + 1
+                    token.end_pos = i + 1
 
                     new_item = item.advance()
                     label = (new_item.s, new_item.start, i)

lark/tools/standalone.py

@@ -28,7 +28,6 @@ import os
 from io import open
 ###}
 
-import pprint
 import codecs
 import sys
 import os

lark-stubs/exceptions.pyi → lark_stubs/exceptions.pyi

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from typing import Dict, Iterable, Callable
+from typing import Dict, Iterable, Callable, Union
 from .tree import Tree
+from .lexer import Token
 
 
 class LarkError(Exception):
@@ -44,4 +45,5 @@ class UnexpectedCharacters(LexError, UnexpectedInput):
 
 
 class VisitError(LarkError):
-    pass
+    obj: Union[Tree, Token]
+    orig_exc: Exception

setup.py

@@ -6,12 +6,12 @@ __version__ ,= re.findall('__version__ = "(.*)"', open('lark/__init__.py').read(
 setup(
     name = "lark-parser",
     version = __version__,
-    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark-stubs'],
+    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark_stubs'],
 
     requires = [],
     install_requires = [],
 
-    package_data = {'': ['*.md', '*.lark'], 'lark-stubs': ['*.pyi']},
+    package_data = {'': ['*.md', '*.lark'], 'lark_stubs': ['*.pyi']},
 
     test_suite = 'tests.__main__',