Chromium Code Reviews| Index: Source/devtools/front_end/documentation/DocumentationView.js |
| diff --git a/Source/devtools/front_end/documentation/DocumentationView.js b/Source/devtools/front_end/documentation/DocumentationView.js |
| index 5dfded75637a6a6759327cd9b48241db3b7df469..fb78957296925de82a01acff16e785c2f8760b3d 100644 |
| --- a/Source/devtools/front_end/documentation/DocumentationView.js |
| +++ b/Source/devtools/front_end/documentation/DocumentationView.js |
| @@ -45,21 +45,47 @@ WebInspector.DocumentationView.ContextMenuProvider.prototype = { |
| if (!(target instanceof WebInspector.CodeMirrorTextEditor)) |
| return; |
| var textEditor = /** @type {!WebInspector.CodeMirrorTextEditor} */ (target); |
| - var selection = textEditor.selection(); |
| - if (!selection || selection.isEmpty() || selection.startLine !== selection.endLine) |
| - return; |
| - var selectedText = textEditor.copyRange(selection); |
| - var urlProvider = new WebInspector.DocumentationURLProvider(); |
| - var descriptors = urlProvider.itemDescriptors(selectedText); |
| + var descriptors = this._determineDescriptors(textEditor); |
| + |
| if (!descriptors.length) |
| return; |
| if (descriptors.length === 1) { |
| var formatString = WebInspector.useLowerCaseMenuTitles() ? "Show documentation for %s.%s" : "Show Documentation for %s.%s"; |
| - contextMenu.appendItem(WebInspector.UIString(formatString, descriptors[0].name, selectedText), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[0].url)); |
| + contextMenu.appendItem(WebInspector.UIString(formatString, descriptors[0].name, descriptors[0].searchItem), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[0].url)); |
| return; |
| } |
| var subMenuItem = contextMenu.appendSubMenuItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Show documentation for..." : "Show Documentation for...")); |
| for (var i = 0; i < descriptors.length; ++i) |
| - subMenuItem.appendItem(String.sprintf("%s.%s", descriptors[i].name, selectedText), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[i].url)); |
| + subMenuItem.appendItem(String.sprintf("%s.%s", descriptors[i].name, descriptors[i].searchItem), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[i].url)); |
| + }, |
| + /** |
|
apavlov
2014/08/15 10:48:58
blank line above
semeny
2014/08/15 11:00:57
Done.
|
| + * @param {!WebInspector.CodeMirrorTextEditor} textEditor |
| + * @return {!Array.<{url: string, name: string, searchItem: string}>} |
| + */ |
| + _determineDescriptors: function(textEditor) |
| + { |
| + var urlProvider = new WebInspector.DocumentationURLProvider(); |
| + var textSelection = textEditor.selection().normalize(); |
| + |
| + if (!textSelection.isEmpty()) { |
| + if (textSelection.startLine !== textSelection.endLine) |
| + return []; |
| + return urlProvider.itemDescriptors(textEditor.copyRange(textSelection)); |
| + } |
| + |
| + var descriptors = computeDescriptors(textSelection.startColumn); |
| + if (descriptors && descriptors.length) |
|
apavlov
2014/08/15 10:48:58
|descriptors| is never null, please remove the fir
semeny
2014/08/15 11:00:57
Done.
|
| + return descriptors; |
| + |
| + return computeDescriptors(textSelection.startColumn - 1); |
| + |
| + function computeDescriptors(column) |
|
apavlov
2014/08/15 10:48:58
Please annotate
semeny
2014/08/15 11:00:57
Done.
|
| + { |
| + var token = textEditor.tokenAtTextPosition(textSelection.startLine, column); |
| + if (!token) |
| + return []; |
| + var tokenText = textEditor.line(textSelection.startLine).substring(token.startColumn, token.endColumn); |
| + return urlProvider.itemDescriptors(tokenText); |
| + } |
| } |
| } |