From 2ca2dbcc923a005b95459b1ad4c6f5b5600fd17c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 17 Jan 2022 19:23:24 +0000 Subject: [PATCH] Correct `distinct` printing --- tools/odin-html-docs/odin_html_docs_main.odin | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/odin-html-docs/odin_html_docs_main.odin b/tools/odin-html-docs/odin_html_docs_main.odin index d1e4f4432..90010369d 100644 --- a/tools/odin-html-docs/odin_html_docs_main.odin +++ b/tools/odin-html-docs/odin_html_docs_main.odin @@ -370,7 +370,7 @@ write_type :: proc(using writer: ^Type_Writer, type: doc.Type, flags: Write_Type fmt.wprintf(w, ``) tn_pkg := files[e.pos.file].pkg if tn_pkg != pkg { - fmt.wprintf(w, `%s.`, str(pkgs[pkg].name)) + fmt.wprintf(w, `%s.`, str(pkgs[tn_pkg].name)) } fmt.wprintf(w, `{1:s}`, pkg_to_path[&pkgs[tn_pkg]], name) case .Generic: @@ -727,16 +727,16 @@ write_pkg :: proc(w: io.Writer, path: string, pkg: ^doc.Pkg) { fmt.wprintf(w, "%s :: ", name) the_type := types[e.type] type_to_print := the_type - if the_type.kind == .Named { - if e.pos != entities[array(the_type.entities)[0]].pos { - io.write_string(w, "distinct ") - } else { + if the_type.kind == .Named && .Type_Alias not_in e.flags { + if e.pos == entities[array(the_type.entities)[0]].pos { bt := base_type(the_type) #partial switch bt.kind { case .Struct, .Union, .Proc, .Enum: + // Okay + case: io.write_string(w, "distinct ") - type_to_print = bt } + type_to_print = bt } } write_type(writer, type_to_print, {.Allow_Indent})