use grouping instead of colors to show non-global search hits:

- introduced a new run per file containing all spots belonging
  to the same kind (e.g. var decl, const decl, etc.)
- more comments, better index.go file organization

R=rsc
http://go/go-review/1026028

1 files changed, 19 insertions, 20 deletions

diff --git a/lib/godoc/search.html b/lib/godoc/search.html
index 8dc32b843..927910f65 100644
--- a/lib/godoc/search.html
+++ b/lib/godoc/search.html
@@ -24,37 +24,36 @@
 		{.repeated section @}
 			<h3>package {Pak.Name|html}</h3>
 			{.repeated section Files}
-				{.repeated section Infos}
-					<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}" class="noline">{File.Path|html}:{@|infoLine}</a>
-					<pre>{@|infoSnippet}</pre>
+				{.repeated section Groups}
+					{.repeated section Infos}
+						<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}" class="noline">{File.Path|html}:{@|infoLine}</a>
+						<pre>{@|infoSnippet}</pre>
+					{.end}
 				{.end}
 			{.end}
 		{.end}
 	{.end}
 	{.section Others}
 		<h2>Local declarations and uses</h2>
-		<p>
-		Legend:
-		{.repeated section Legend}
-			<a class="{@|html}">{@|html}</a>
-		{.end}
-		</p>
 		{.repeated section @}
 			<h3>package {Pak.Name|html}</h3>
-			<table border="0" cellspacing="2">
 			{.repeated section Files}
-				<tr>
-				<td valign="top">
-					<a href="{File.Path|html}?h={Query|html}" class="noline">{File.Path|html}:</a>
-				</td>
-				<td>
-				{.repeated section Infos}
-					<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}" class="{@|infoClass}">{@|infoLine}</a>
+				<a href="{File.Path|html}?h={Query|html}" class="noline">{File.Path|html}</a>
+				<table class="layout">
+				{.repeated section Groups}
+					<tr>
+					<td width="25"></td>
+					<th align="left" valign="top">{Kind|infoKind}</th>
+					<td align="left" width="4"></td>
+					<td>
+					{.repeated section Infos}
+						<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}" class="info">{@|infoLine}</a>
+					{.end}
+					</td>
+					</tr>
 				{.end}
-				</td>
-				</tr>
+				</table>
 			{.end}
-			</table>
 		{.end}
 	{.end}
 {.or}