Fix printing of scopes for type aliases in diagnostics

MikePopoloski · Jun 5, 2024 · 0371eb7 · 0371eb7
1 parent 2d42130
commit 0371eb7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/source/ast/types/TypePrinter.cpp b/source/ast/types/TypePrinter.cpp
@@ -387,7 +387,8 @@ void TypePrinter::visit(const TypeAliasType& type, std::string_view overrideName
     if (!overrideName.empty()) {
         type.targetType.getType().visit(*this, overrideName);
     }
-    else if (options.elideScopeNames) {
+    else if (options.elideScopeNames ||
+             options.anonymousTypeStyle == TypePrintingOptions::FriendlyName) {
         type.targetType.getType().visit(*this, type.name);
     }
     else {

diff --git a/tests/unittests/ast/ExpressionTests.cpp b/tests/unittests/ast/ExpressionTests.cpp
@@ -3619,3 +3619,28 @@ endmodule
     REQUIRE(diags.size() == 1);
     CHECK(diags[0].code == diag::BadConcatExpression);
 }
+
+TEST_CASE("Wrong typename in error regress GH #1013") {
+    auto tree = SyntaxTree::fromText(R"(
+module t40;
+typedef struct {
+        logic a;
+        logic b;
+} t;
+t x, y, z;
+assign z = x & y;
+
+endmodule
+)");
+
+    Compilation compilation;
+    compilation.addSyntaxTree(tree);
+
+    auto& diags = compilation.getAllDiagnostics();
+    std::string result = "\n" + report(diags);
+    CHECK(result == R"(
+source:8:14: error: invalid operands to binary expression ('t40.t' and 't40.t')
+assign z = x & y;
+           ~ ^ ~
+)");
+}