diff --git a/midas/cli/highlighter.py b/midas/cli/highlighter.py index 16fdf94..af81890 100644 --- a/midas/cli/highlighter.py +++ b/midas/cli/highlighter.py @@ -232,15 +232,14 @@ class MidasHighlighter( self.wrap(LocatableToken(stmt.name), "type-name") stmt.type.accept(self) - def visit_property_stmt(self, stmt: m.PropertyStmt) -> None: - self.wrap(stmt, "property") + def visit_member_stmt(self, stmt: m.MemberStmt) -> None: + self.wrap(stmt, "member") stmt.type.accept(self) def visit_extend_stmt(self, stmt: m.ExtendStmt) -> None: self.wrap(stmt, "extend") - stmt.type.accept(self) - for op in stmt.operations: - op.accept(self) + for member in stmt.members: + member.accept(self) def visit_op_stmt(self, stmt: m.OpStmt) -> None: self.wrap(stmt, "op") @@ -298,8 +297,8 @@ class MidasHighlighter( def visit_complex_type(self, type: m.ComplexType) -> None: self.wrap(type, "complex-type") - for prop in type.properties: - prop.accept(self) + for member in type.members: + member.accept(self) def visit_function_type(self, type: m.FunctionType) -> None: self.wrap(type, "function") @@ -307,6 +306,11 @@ class MidasHighlighter( arg.type.accept(self) type.returns.accept(self) + def visit_extension_type(self, type: m.ExtensionType) -> None: + self.wrap(type, "extension") + type.base.accept(self) + type.extension.accept(self) + class DiagnosticsHighlighter(Highlighter): EXTRA_CSS_PATH: Optional[Path] = Path(__file__).parent / "hl_diagnostic.css"