jdk-sandbox: comparison src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js

Mercurial Mercurial > jdk-sandbox / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js

changeset 54619	b43cc3b9ef40
parent 54589	3babb3ed24c6

equal deleted inserted replaced

-:152c6c501ba5
+:b43cc3b9ef40
 /*
-* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 var catPackages = "Packages";
 var catTypes = "Types";
 var catMembers = "Members";
 var catSearchTags = "SearchTags";
 var highlight = "<span class=\"resultHighlight\">$&</span>";
-var camelCaseRegexp = "";
+var searchPattern = "";
-var secondaryMatcher = "";
+var RANKING_THRESHOLD = 2;
+var NO_MATCH = 0xffff;
+var MAX_RESULTS_PER_CATEGORY = 500;
 function escapeHtml(str) {
 return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function getHighlightedText(item) {
+function getHighlightedText(item, matcher) {
-var ccMatcher = new RegExp(escapeHtml(camelCaseRegexp));
 var escapedItem = escapeHtml(item);
-var label = escapedItem.replace(ccMatcher, highlight);
+return escapedItem.replace(matcher, highlight);
-if (label === escapedItem) {
-var secMatcher = new RegExp(escapeHtml(secondaryMatcher.source), "i");
-label = escapedItem.replace(secMatcher, highlight);
-}
-return label;
 }
 function getURLPrefix(ui) {
 var urlPrefix="";
 var slash = "/";
 if (ui.item.category === catModules) {
 } else {
 return urlPrefix;
 }
 return urlPrefix;
 }
+function makeCamelCaseRegex(term) {
+var pattern = "";
+var isWordToken = false;
+term.replace(/,\s*/g, ", ").trim().split(/\s+/).forEach(function(w, index) {
+if (index > 0) {
+// whitespace between identifiers is significant
+pattern += (isWordToken && /^\w/.test(w)) ? "\\s+" : "\\s*";
+}
+var tokens = w.split(/(?=[A-Z,.()<>[\/])/);
+for (var i = 0; i < tokens.length; i++) {
+var s = tokens[i];
+if (s === "") {
+continue;
+}
+pattern += $.ui.autocomplete.escapeRegex(s);
+isWordToken =  /\w$/.test(s);
+if (isWordToken) {
+pattern += "([a-z0-9_$<>\\[\\]]*?)";
+}
+}
+});
+return pattern;
+}
+function createMatcher(pattern, flags) {
+var isCamelCase = /[A-Z]/.test(pattern);
+return new RegExp(pattern, flags + (isCamelCase ? "" : "i"));
+}
 var watermark = 'Search';
 $(function() {
 $("#search").val('');
 $("#search").prop("disabled", false);
 $("#reset").prop("disabled", false);
 _create: function() {
 this._super();
 this.widget().menu("option", "items", "> :not(.ui-autocomplete-category)");
 },
 _renderMenu: function(ul, items) {
-var rMenu = this,
+var rMenu = this;
-currentCategory = "";
+var currentCategory = "";
 rMenu.menu.bindings = $();
 $.each(items, function(index, item) {
 var li;
 if (item.l !== noResult.l && item.category !== currentCategory) {
 ul.append("<li class=\"ui-autocomplete-category\">" + item.category + "</li>");
 }
 });
 },
 _renderItem: function(ul, item) {
 var label = "";
+var matcher = createMatcher(escapeHtml(searchPattern), "g");
 if (item.category === catModules) {
-label = getHighlightedText(item.l);
+label = getHighlightedText(item.l, matcher);
 } else if (item.category === catPackages) {
 label = (item.m)
-? getHighlightedText(item.m + "/" + item.l)
+? getHighlightedText(item.m + "/" + item.l, matcher)
-: getHighlightedText(item.l);
+: getHighlightedText(item.l, matcher);
 } else if (item.category === catTypes) {
 label = (item.p)
-? getHighlightedText(item.p + "." + item.l)
+? getHighlightedText(item.p + "." + item.l, matcher)
-: getHighlightedText(item.l);
+: getHighlightedText(item.l, matcher);
 } else if (item.category === catMembers) {
-label = getHighlightedText(item.p + "." + (item.c + "." + item.l));
+label = getHighlightedText(item.p + "." + (item.c + "." + item.l), matcher);
 } else if (item.category === catSearchTags) {
-label = getHighlightedText(item.l);
+label = getHighlightedText(item.l, matcher);
 } else {
 label = item.l;
 }
 var li = $("<li/>").appendTo(ul);
 var div = $("<div/>").appendTo(li);
 div.html(label);
 }
 return li;
 }
 });
+function rankMatch(match, category) {
+if (!match) {
+return NO_MATCH;
+}
+var index = match.index;
+var input = match.input;
+var leftBoundaryMatch = 2;
+var periferalMatch = 0;
+var delta = 0;
+// make sure match is anchored on a left word boundary
+if (index === 0 || /\W/.test(input[index - 1]) || "_" === input[index - 1] || "_" === input[index]) {
+leftBoundaryMatch = 0;
+} else if (input[index] === input[index].toUpperCase() && !/^[A-Z0-9_$]+$/.test(input)) {
+leftBoundaryMatch = 1;
+}
+var matchEnd = index + match[0].length;
+var leftParen = input.indexOf("(");
+// exclude peripheral matches
+if (category !== catModules && category !== catSearchTags) {
+var endOfName = leftParen > -1 ? leftParen : input.length;
+var delim = category === catPackages ? "/" : ".";
+if (leftParen > -1 && leftParen < index) {
+periferalMatch += 2;
+} else if (input.lastIndexOf(delim, endOfName) >= matchEnd) {
+periferalMatch += 2;
+}
+}
+for (var i = 1; i < match.length; i++) {
+// lower ranking if parts of the name are missing
+if (match[i])
+delta += match[i].length;
+}
+if (category === catTypes) {
+// lower ranking if a type name contains unmatched camel-case parts
+if (/[A-Z]/.test(input.substring(matchEnd)))
+delta += 5;
+if (/[A-Z]/.test(input.substring(0, index)))
+delta += 5;
+}
+return leftBoundaryMatch + periferalMatch + (delta / 200);
+}
 $(function() {
 $("#search").catcomplete({
 minLength: 1,
 delay: 300,
 source: function(request, response) {
-var result = new Array();
+var result = [];
-var presult = new Array();
+var newResults = [];
-var tresult = new Array();
-var mresult = new Array();
+searchPattern = makeCamelCaseRegex(request.term);
-var tgresult = new Array();
+if (searchPattern === "") {
-var secondaryresult = new Array();
+return this.close();
-var displayCount = 0;
+}
-var exactMatcher = new RegExp("^" + $.ui.autocomplete.escapeRegex(request.term) + "$", "i");
+var camelCaseMatcher = createMatcher(searchPattern, "");
-camelCaseRegexp = ($.ui.autocomplete.escapeRegex(request.term)).split(/(?=[A-Z])/).join("([a-z0-9_$]*?)");
+var boundaryMatcher = createMatcher("\\b" + searchPattern, "");
-var camelCaseMatcher = new RegExp("^" + camelCaseRegexp);
-secondaryMatcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
-// Return the nested innermost name from the specified object
-function nestedName(e) {
-return e.l.substring(e.l.lastIndexOf(".") + 1);
-}
 function concatResults(a1, a2) {
-a1 = a1.concat(a2);
+a2.sort(function(e1, e2) {
+return e1.ranking - e2.ranking;
+});
+a1 = a1.concat(a2.map(function(e) { return e.item; }));
 a2.length = 0;
 return a1;
 }
 if (moduleSearchIndex) {
-var mdleCount = 0;
 $.each(moduleSearchIndex, function(index, item) {
 item.category = catModules;
-if (exactMatcher.test(item.l)) {
+var ranking = rankMatch(boundaryMatcher.exec(item.l), catModules);
-result.push(item);
+if (ranking < RANKING_THRESHOLD) {
-mdleCount++;
+newResults.push({ ranking: ranking, item: item });
-} else if (camelCaseMatcher.test(item.l)) {
+}
-result.push(item);
+return newResults.length < MAX_RESULTS_PER_CATEGORY;
-} else if (secondaryMatcher.test(item.l)) {
+});
-secondaryresult.push(item);
+result = concatResults(result, newResults);
-}
-});
-displayCount = mdleCount;
-result = concatResults(result, secondaryresult);
 }
 if (packageSearchIndex) {
-var pCount = 0;
-var pkg = "";
 $.each(packageSearchIndex, function(index, item) {
 item.category = catPackages;
-pkg = (item.m)
+var name = (item.m && request.term.indexOf("/") > -1)
 ? (item.m + "/" + item.l)
 : item.l;
-if (exactMatcher.test(item.l)) {
+var ranking = rankMatch(boundaryMatcher.exec(name), catPackages);
-presult.push(item);
+if (ranking < RANKING_THRESHOLD) {
-pCount++;
+newResults.push({ ranking: ranking, item: item });
-} else if (camelCaseMatcher.test(pkg)) {
+}
-presult.push(item);
+return newResults.length < MAX_RESULTS_PER_CATEGORY;
-} else if (secondaryMatcher.test(pkg)) {
+});
-secondaryresult.push(item);
+result = concatResults(result, newResults);
-}
-});
-result = result.concat(concatResults(presult, secondaryresult));
-displayCount = (pCount > displayCount) ? pCount : displayCount;
 }
 if (typeSearchIndex) {
-var tCount = 0;
 $.each(typeSearchIndex, function(index, item) {
 item.category = catTypes;
-var s = nestedName(item);
+var name = request.term.indexOf(".") > -1
-if (exactMatcher.test(s)) {
+? item.p + "." + item.l
-tresult.push(item);
+: item.l;
-tCount++;
+var ranking = rankMatch(camelCaseMatcher.exec(name), catTypes);
-} else if (camelCaseMatcher.test(s)) {
+if (ranking < RANKING_THRESHOLD) {
-tresult.push(item);
+newResults.push({ ranking: ranking, item: item });
-} else if (secondaryMatcher.test(item.p + "." + item.l)) {
+}
-secondaryresult.push(item);
+return newResults.length < MAX_RESULTS_PER_CATEGORY;
-}
+});
-});
+result = concatResults(result, newResults);
-result = result.concat(concatResults(tresult, secondaryresult));
-displayCount = (tCount > displayCount) ? tCount : displayCount;
 }
 if (memberSearchIndex) {
-var mCount = 0;
 $.each(memberSearchIndex, function(index, item) {
 item.category = catMembers;
-var s = nestedName(item);
+var name = request.term.indexOf(".") > -1
-if (exactMatcher.test(s)) {
+? item.p + "." + item.c + "." + item.l
-mresult.push(item);
+: item.l;
-mCount++;
+var ranking = rankMatch(camelCaseMatcher.exec(name), catMembers);
-} else if (camelCaseMatcher.test(s)) {
+if (ranking < RANKING_THRESHOLD) {
-mresult.push(item);
+newResults.push({ ranking: ranking, item: item });
-} else if (secondaryMatcher.test(item.c + "." + item.l)) {
+}
-secondaryresult.push(item);
+return newResults.length < MAX_RESULTS_PER_CATEGORY;
-}
+});
-});
+result = concatResults(result, newResults);
-result = result.concat(concatResults(mresult, secondaryresult));
-displayCount = (mCount > displayCount) ? mCount : displayCount;
 }
 if (tagSearchIndex) {
-var tgCount = 0;
 $.each(tagSearchIndex, function(index, item) {
 item.category = catSearchTags;
-if (exactMatcher.test(item.l)) {
+var ranking = rankMatch(boundaryMatcher.exec(item.l), catSearchTags);
-tgresult.push(item);
+if (ranking < RANKING_THRESHOLD) {
-tgCount++;
+newResults.push({ ranking: ranking, item: item });
-} else if (secondaryMatcher.test(item.l)) {
+}
-secondaryresult.push(item);
+return newResults.length < MAX_RESULTS_PER_CATEGORY;
-}
+});
-});
+result = concatResults(result, newResults);
-result = result.concat(concatResults(tgresult, secondaryresult));
+}
-displayCount = (tgCount > displayCount) ? tgCount : displayCount;
+response(result);
-}
-displayCount = (displayCount > 500) ? displayCount : 500;
-var counter = function() {
-var count = {Modules: 0, Packages: 0, Types: 0, Members: 0, SearchTags: 0};
-var f = function(item) {
-count[item.category] += 1;
-return (count[item.category] <= displayCount);
-};
-return f;
-}();
-response(result.filter(counter));
 },
 response: function(event, ui) {
 if (!ui.content.length) {
 ui.content.push(noResult);
 } else {

jdk-sandbox