1 files changed, 37 insertions, 14 deletions
diff --git a/lib/docs/main.js b/lib/docs/main.js
index e10318c02d..9686b09aaf 100644
--- a/lib/docs/main.js
+++ b/lib/docs/main.js
@@ -1848,18 +1848,26 @@ const NAV_MODES = {
           case typeKinds.Struct: {
             let structObj = typeObj;
             let name = "";
+            let layout = "";
+            if (structObj.layout !== null) {
+              switch (structObj.layout.enumLiteral) {
+                case "Packed": {
+                  layout = "packed ";
+                  break;
+                }
+                case "Extern": {
+                  layout = "extern ";
+                  break;
+                }
+              }
+            }
             if (opts.wantHtml) {
-              name = "<span class='tok-kw'>struct</span>";
+              name = "<span class='tok-kw'>" + layout + "struct</span>";
             } else {
-              name = "struct";
+              name = layout + "struct";
             }
             if (structObj.backing_int !== null) {
-              if (opts.wantHtml) {
-                name = "<span class='tok-kw'>packed</span> " + name;
-              } else {
-                name = "packed " + name;
-              }
-              name += " (" + exprName(structObj.backing_int, opts) + ")";
+              name += "(" + exprName(structObj.backing_int, opts) + ")";
             }
             name += " { ";
             if (structObj.field_types.length > 1 && opts.wantHtml) { name += "</br>"; }
@@ -1916,7 +1924,7 @@ const NAV_MODES = {
               name = "enum";
             }
             if (enumObj.tag) {
-              name += " (" + exprName(enumObj.tag, opts) + ")";
+              name += "(" + exprName(enumObj.tag, opts) + ")";
             }
             name += " { ";
             let enumNode = getAstNode(enumObj.src);
@@ -1967,16 +1975,29 @@ const NAV_MODES = {
           case typeKinds.Union: {
             let unionObj = typeObj;
             let name = "";
+            let layout = "";
+            if (unionObj.layout !== null) {
+              switch (unionObj.layout.enumLiteral) {
+                case "Packed": {
+                  layout = "packed ";
+                  break;
+                }
+                case "Extern": {
+                  layout = "extern ";
+                  break;
+                }
+              }
+            }
             if (opts.wantHtml) {
-              name = "<span class='tok-kw'>union</span>";
+              name = "<span class='tok-kw'>" + layout + "union</span>";
             } else {
-              name = "union";
+              name = layout + "union";
             }
             if (unionObj.auto_tag) {
               if (opts.wantHtml) {
-                name += " (<span class='tok-kw'>enum</span>";
+                name += "(<span class='tok-kw'>enum</span>";
               } else {
-                name += " (enum";
+                name += "(enum";
               }
               if (unionObj.tag) {
                 name += "(" + exprName(unionObj.tag, opts) + "))";
@@ -1984,7 +2005,7 @@ const NAV_MODES = {
                 name += ")";
               }
             } else if (unionObj.tag) {
-              name += " (" + exprName(unionObj.tag, opts) + ")";
+              name += "(" + exprName(unionObj.tag, opts) + ")";
             }
             name += " { ";
             if (unionObj.field_types.length > 1 && opts.wantHtml) {
@@ -4510,6 +4531,7 @@ function addDeclToSearchResults(decl, declIndex, modNames, item, list, stack) {
           is_tuple: ty[8],
           line_number: ty[9],
           parent_container: ty[10],
+          layout: ty[11],
         };
       case 10: // ComptimeExpr
       case 11: // ComptimeFloat
@@ -4563,6 +4585,7 @@ function addDeclToSearchResults(decl, declIndex, modNames, item, list, stack) {
           tag: ty[6],
           auto_tag: ty[7],
           parent_container: ty[8],
+          layout: ty[9],
         };
       case 21: // Fn
         return {