autodoc: better line counting for decls

1 files changed, 6 insertions, 10 deletions

diff --git a/lib/docs/main.js b/lib/docs/main.js
index 703ae84604..6a3f2620f2 100644
--- a/lib/docs/main.js
+++ b/lib/docs/main.js
@@ -54,7 +54,6 @@ var zigAnalysis;
   const sourceFileUrlTemplate = "src/{{file}}#L{{line}}"
   const domLangRefLink = document.getElementById("langRefLink");
 
-  let lineCounter = 1;
   let searchTimer = null;
   let searchTrimResults = true;
 
@@ -413,8 +412,7 @@ var zigAnalysis;
     if (curNavSearch !== "") {
       return renderSearch();
     }
-    
-    lineCounter = 1;
+
 
     let rootPkg = zigAnalysis.packages[zigAnalysis.rootPkg];
     let pkg = rootPkg;
@@ -445,10 +443,6 @@ var zigAnalysis;
       }
 
       currentType = childDecl;
-      if ("src" in currentType) {
-        const ast_node = zigAnalysis.astNodes[currentType.src];
-        lineCounter += ast_node.line; 
-      }
       curNav.declObjs.push(currentType);
     }
 
@@ -2289,9 +2283,9 @@ var zigAnalysis;
   function renderSourceFileLink(decl) {
     let srcNode = zigAnalysis.astNodes[decl.src];
 
-    return  "<a style=\"float: right;\" href=\"" + 
-      sourceFileUrlTemplate.replace("{{file}}", 
-        zigAnalysis.files[srcNode.file]).replace("{{line}}", lineCounter + srcNode.line) + "\">[src]</a>";
+    return  "<a style=\"float: right;\" href=\"" +
+      sourceFileUrlTemplate.replace("{{file}}",
+        zigAnalysis.files[srcNode.file]).replace("{{line}}", srcNode.line) + "\">[src]</a>";
   }
 
   function renderContainer(container) {
@@ -3290,6 +3284,8 @@ var zigAnalysis;
         break;
       case "s":
         if (domHelpModal.classList.contains("hidden")) {
+          if (ev.target == domSearch) break;
+
           domSearch.focus();
           domSearch.select();
           domDocs.scrollTo(0, 0);