8176794: javadoc search results sorted incorrectly on packages
Reviewed-by: jjg, ksrini
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js
index ea8678a..7ce9904 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js
@@ -229,8 +229,7 @@
pkg = (item.m)
? (item.m + "/" + item.l)
: item.l;
- var s = nestedName(item);
- if (exactMatcher.test(s)) {
+ if (exactMatcher.test(item.l)) {
presult.unshift(item);
pCount++;
} else if (camelCaseMatcher.test(pkg)) {
diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java b/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java
index 7f58063..ccda732 100644
--- a/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8141492 8071982 8141636 8147890 8166175 8168965
+ * @bug 8141492 8071982 8141636 8147890 8166175 8168965 8176794
* @summary Test the search feature of javadoc.
* @author bpatel
* @library ../lib
@@ -489,6 +489,8 @@
"camelCaseMatcher.test(item.l)",
"var secondaryresult = new Array();",
"function nestedName(e) {",
- "function sortAndConcatResults(a1, a2) {");
+ "function sortAndConcatResults(a1, a2) {",
+ "if (exactMatcher.test(item.l)) {\n"
+ + " presult.unshift(item);");
}
}
