fix[ux]: add missing filename to syntax exceptions

tests/functional/syntax/exceptions/test_vyper_exception_pos.py

@@ -1,6 +1,7 @@
 from pytest import raises
 
-from vyper.exceptions import VyperException
+from vyper import compile_code
+from vyper.exceptions import SyntaxException, VyperException
 
 
 def test_type_exception_pos():
@@ -29,3 +30,21 @@ def __init__():
 
     """
     assert_compile_failed(lambda: get_contract(code), VyperException)
+
+
+def test_exception_contains_file(make_input_bundle):
+    code = """
+def bar()>:
+    """
+    input_bundle = make_input_bundle({"code.vy": code})
+    with raises(SyntaxException, match="contract"):
+        compile_code(code, input_bundle=input_bundle)
+
+
+def test_exception_reports_correct_file(make_input_bundle):
+    code_a = "def bar()>:"
+    code_b = "import A"
+    input_bundle = make_input_bundle({"A.vy": code_a, "B.vy": code_b})
+
+    with raises(SyntaxException, match=r'contract ".*A\.vy"'):
+        compile_code(code_b, input_bundle=input_bundle)

tests/unit/ast/test_natspec.py

@@ -436,3 +436,19 @@ def test_natspec_parsed_implicitly():
     # anything beyond ast is blocked
     with pytest.raises(NatSpecSyntaxException):
         compile_code(code, output_formats=["annotated_ast_dict"])
+
+
+def test_natspec_exception_contains_file_path():
+    code = """
+@external
+def foo() -> (int128,uint256):
+    '''
+    @return int128
+    @return uint256
+    @return this should fail
+    '''
+    return 1, 2
+    """
+
+    with pytest.raises(NatSpecSyntaxException, match=r'contract ".*\.vy"'):
+        parse_natspec(code)

tests/unit/ast/test_pre_parser.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import pytest
 
 from vyper import compile_code
@@ -56,6 +58,22 @@ def test_invalid_version_pragma(file_version, mock_version):
         validate_version_pragma(f"{file_version}", file_version, (SRC_LINE))
 
 
+def test_invalid_version_contains_file(mock_version):
+    mock_version(COMPILER_VERSION)
+    with pytest.raises(VersionException, match=r'contract ".*\.vy"'):
+        compile_code("# pragma version ^0.3.10", resolved_path=Path("mock.vy"))
+
+
+def test_imported_invalid_version_contains_correct_file(mock_version, make_input_bundle):
+    code_a = "# pragma version ^0.3.10"
+    code_b = "import A"
+    input_bundle = make_input_bundle({"A.vy": code_a, "B.vy": code_b})
+    mock_version(COMPILER_VERSION)
+
+    with pytest.raises(VersionException, match=r'contract ".*A\.vy"'):
+        compile_code(code_b, input_bundle=input_bundle)
+
+
 prerelease_valid_versions = [
     "<0.1.1-beta.9",
     "<0.1.1b9",

tests/unit/cli/vyper_json/test_compile_json.py

@@ -237,7 +237,7 @@ def test_wrong_language():
 
 def test_exc_handler_raises_syntax(input_json):
     input_json["sources"]["badcode.vy"] = {"content": BAD_SYNTAX_CODE}
-    with pytest.raises(SyntaxException):
+    with pytest.raises(SyntaxException, match=r'contract ".*badcode\.vy"'):
         compile_json(input_json)
 
 

vyper/ast/parse.py

@@ -23,6 +23,22 @@ def parse_to_ast_with_settings(
     module_path: Optional[str] = None,
     resolved_path: Optional[str] = None,
     add_fn_node: Optional[str] = None,
+) -> tuple[Settings, vy_ast.Module]:
+    try:
+        return _parse_to_ast_with_settings(
+            vyper_source, source_id, module_path, resolved_path, add_fn_node
+        )
+    except SyntaxException as e:
+        e.path = resolved_path
+        raise e
+
+
+def _parse_to_ast_with_settings(
+    vyper_source: str,
+    source_id: int = 0,
+    module_path: Optional[str] = None,
+    resolved_path: Optional[str] = None,
+    add_fn_node: Optional[str] = None,
 ) -> tuple[Settings, vy_ast.Module]:
     """
     Parses a Vyper source string and generates basic Vyper AST nodes.

vyper/compiler/phases.py

@@ -10,6 +10,7 @@
 from vyper.codegen.ir_node import IRnode
 from vyper.compiler.input_bundle import FileInput, FilesystemInputBundle, InputBundle
 from vyper.compiler.settings import OptimizationLevel, Settings, anchor_settings, merge_settings
+from vyper.exceptions import SyntaxException
 from vyper.ir import compile_ir, optimizer
 from vyper.semantics import analyze_module, set_data_positions, validate_compilation_target
 from vyper.semantics.analysis.data_positions import generate_layout_export
@@ -174,7 +175,11 @@ def resolved_imports(self):
     def _annotate(self) -> tuple[natspec.NatspecOutput, vy_ast.Module]:
         module = self._resolve_imports[0]
         analyze_module(module)
-        nspec = natspec.parse_natspec(module)
+        try:
+            nspec = natspec.parse_natspec(module)
+        except SyntaxException as e:
+            e.path = module.resolved_path
+            raise e
         return nspec, module
 
     @cached_property

vyper/exceptions.py

@@ -54,6 +54,7 @@ def __init__(self, message="Error Message not found.", *items, hint=None, prev_d
         self.lineno = None
         self.col_offset = None
         self.annotations = None
+        self.path = None
 
         if len(items) == 1 and isinstance(items[0], tuple) and isinstance(items[0][0], int):
             # support older exceptions that don't annotate - remove this in the future!
@@ -134,6 +135,9 @@ def format_annotation(self, value):
             if fn_node:
                 node_msg = f'{node_msg}function "{fn_node.name}", '
 
+        if self.path is not None:
+            node_msg = f'{node_msg}contract "{self.path}", '
+
         col_offset_str = "" if node.col_offset is None else str(node.col_offset)
         node_msg = f"{node_msg}line {node.lineno}:{col_offset_str} \n{source_annotation}\n"