feat: Update top-level definitions to use new diagnostics #604
Conversation
| raise GuppyError("Guppy functions can only be called in a Guppy context") | ||
| raise RuntimeError("Guppy functions can only be called in a Guppy context") |
There was a problem hiding this comment.
Guppy errors are now reserved for things that go wrong during compilation. This error is thrown immediately when the user calls the function, so we shouldn't use GuppyError
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feat/diagnostics #604 +/- ##
====================================================
+ Coverage 91.75% 92.40% +0.65%
====================================================
Files 61 65 +4
Lines 6633 7162 +529
====================================================
+ Hits 6086 6618 +532
+ Misses 547 544 -3 ☔ View full report in Codecov by Sentry. |
guppylang/definition/custom.py
Outdated
| self.defined_at, | ||
| ) | ||
| err = NoSignatureError(self.defined_at, self.name) | ||
| err.add_sub_diagnostic(NoSignatureError.Suggestion(None)) |
There was a problem hiding this comment.
I think it uses the default message?
There was a problem hiding this comment.
The None means that this sub diagnostic does not have span, it's just rendered as text below the main error.
I updated to code so that this subdiagnostic is added by default
| sources.add_file(file) | ||
| annotate_location(func_ast, source, file, line_offset) | ||
| if not isinstance(func_ast, ast.FunctionDef): | ||
| raise GuppyError("Expected a function definition", func_ast) | ||
| raise GuppyError(ExpectedError(func_ast, "a function definition")) |
guppylang/definition/custom.py
Outdated
| @@ -69,6 +101,8 @@ def parse(self, globals: "Globals", sources: SourceMap) -> "CustomFunctionDef": | |||
| code. The only information we need to access is that it's a function type and | |||
| that there are no unsolved existential vars. | |||
| """ | |||
| if not has_empty_body(self.defined_at): | |||
| raise GuppyError(BodyNotEmptyError(self.defined_at.body[0], self.name)) | |||
| @@ -245,7 +271,7 @@ def parse_py_class(cls: type, sources: SourceMap) -> ast.ClassDef: | |||
| if defn is not None: | |||
| annotate_location(defn.node, defn.cell_source, f"<{defn.cell_name}>", 1) | |||
| if not isinstance(defn.node, ast.ClassDef): | |||
| raise GuppyError("Expected a class definition", defn.node) | |||
| raise GuppyError(ExpectedError(defn.node, "a class definition")) | |||
There was a problem hiding this comment.
This is only triggered in notebook so makes it hard to test. I'll leave it without coverage for now
| @@ -254,12 +280,12 @@ def parse_py_class(cls: type, sources: SourceMap) -> ast.ClassDef: | |||
| cls_ast = ast.parse(source).body[0] | |||
| file = inspect.getsourcefile(cls) | |||
| if file is None: | |||
| raise GuppyError("Couldn't determine source file for class") | |||
| raise GuppyError(UnknownSourceError(None, cls)) | |||
| # Store the source file in our cache | ||
| sources.add_file(file) | ||
| annotate_location(cls_ast, source, file, line_offset) | ||
| if not isinstance(cls_ast, ast.ClassDef): | ||
| raise GuppyError("Expected a class definition", cls_ast) | ||
| raise GuppyError(ExpectedError(cls_ast, "a class definition")) |
| raise GuppyError( | ||
| f"Parameter `{node.id}` cannot be used multiple times", node | ||
| ) | ||
| raise GuppyError(RepeatedTypeParamError(node, node.id)) |
| 13 | def x(self: "MyStruct") -> int: | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| 14 | return 0 | ||
| | ^^^^^^^^^^^^^^^^ Struct `MyStruct` already contains a field named `x` |
There was a problem hiding this comment.
what's going on with this ^^^.. prefix, looks wrong
There was a problem hiding this comment.
It highlights the whole definition span, including the leading whitespace (since this method is indented inside a class)
No description provided.