From ff78998302d4fa06be7dcee198358a447f756daf Mon Sep 17 00:00:00 2001 From: Brijesh Patel Date: Tue, 13 Dec 2011 09:47:31 -0400 Subject: [PATCH] Bug 704295 - Autocomplete with a variable name that is equal to a prefix of a global variable makes it impossible to use the variable; r=msucan --- .../devtools/webconsole/AutocompletePopup.jsm | 3 + browser/devtools/webconsole/HUDService.jsm | 11 +-- .../webconsole/test/browser/Makefile.in | 1 + ...webconsole_bug_585991_autocomplete_keys.js | 9 +++ .../browser/browser_webconsole_bug_704295.js | 76 +++++++++++++++++++ .../browser/browser_webconsole_completion.js | 2 +- 6 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 browser/devtools/webconsole/test/browser/browser_webconsole_bug_704295.js diff --git a/browser/devtools/webconsole/AutocompletePopup.jsm b/browser/devtools/webconsole/AutocompletePopup.jsm index af5fd40fbbf8..49058651dbc3 100644 --- a/browser/devtools/webconsole/AutocompletePopup.jsm +++ b/browser/devtools/webconsole/AutocompletePopup.jsm @@ -221,6 +221,9 @@ AutocompletePopup.prototype = { */ clearItems: function AP_clearItems() { + // Reset the selectedIndex to -1 before clearing the list + this.selectedIndex = -1; + while (this._list.hasChildNodes()) { this._list.removeChild(this._list.firstChild); } diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm index 6768f67a641e..df56248dabd1 100644 --- a/browser/devtools/webconsole/HUDService.jsm +++ b/browser/devtools/webconsole/HUDService.jsm @@ -5223,7 +5223,7 @@ JSTerm.prototype = { break; case Ci.nsIDOMKeyEvent.DOM_VK_RETURN: - if (this.autocompletePopup.isOpen) { + if (this.autocompletePopup.isOpen && this.autocompletePopup.selectedIndex > -1) { this.acceptProposedCompletion(); } else { @@ -5439,13 +5439,10 @@ JSTerm.prototype = { popup.hidePopup(); } - if (items.length > 0) { - popup.selectedIndex = 0; - if (items.length == 1) { - // onSelect is not fired when the popup is not open. - this.onAutocompleteSelect(); - } + if (items.length == 1) { + popup.selectedIndex = 0; } + this.onAutocompleteSelect(); } let accepted = false; diff --git a/browser/devtools/webconsole/test/browser/Makefile.in b/browser/devtools/webconsole/test/browser/Makefile.in index db93eb8788bb..a6cd6ca7f8f5 100644 --- a/browser/devtools/webconsole/test/browser/Makefile.in +++ b/browser/devtools/webconsole/test/browser/Makefile.in @@ -142,6 +142,7 @@ _BROWSER_TEST_FILES = \ browser_webconsole_bug_659907_console_dir.js \ browser_webconsole_bug_678816.js \ browser_webconsole_bug_664131_console_group.js \ + browser_webconsole_bug_704295.js \ browser_gcli_inspect.js \ browser_gcli_integrate.js \ browser_gcli_require.js \ diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_keys.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_keys.js index acdedc3892c9..ed1619048366 100644 --- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_keys.js +++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_keys.js @@ -74,6 +74,9 @@ function tabLoaded() { return aItem.label == "item" + aIndex; }), true, "getItems returns back the same items"); + is(popup.selectedIndex, -1, "no index is selected"); + EventUtils.synthesizeKey("VK_DOWN", {}); + let prefix = jsterm.inputNode.value.replace(/[\S]/g, " "); is(popup.selectedIndex, 0, "index 0 is selected"); @@ -124,6 +127,9 @@ function autocompletePopupHidden() is(popup.itemCount, 4, "popup.itemCount is correct"); + is(popup.selectedIndex, -1, "no index is selected"); + EventUtils.synthesizeKey("VK_DOWN", {}); + let prefix = jsterm.inputNode.value.replace(/[\S]/g, " "); is(popup.selectedIndex, 0, "index 0 is selected"); @@ -167,6 +173,9 @@ function testReturnKey() ok(popup.isOpen, "popup is open"); is(popup.itemCount, 4, "popup.itemCount is correct"); + + is(popup.selectedIndex, -1, "no index is selected"); + EventUtils.synthesizeKey("VK_DOWN", {}); let prefix = jsterm.inputNode.value.replace(/[\S]/g, " "); diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_704295.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_704295.js new file mode 100644 index 000000000000..98751b8575fa --- /dev/null +++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_704295.js @@ -0,0 +1,76 @@ +/* vim:set ts=2 sw=2 sts=2 et: */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is DevTools test code. + * + * The Initial Developer of the Original Code is Mozilla Foundation. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Mihai Sucan + * Brijesh Patel + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// Tests for bug 704295 + +const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html"; + +function test() { + addTab(TEST_URI); + browser.addEventListener("DOMContentLoaded", testCompletion, false); +} + +function testCompletion() { + browser.removeEventListener("DOMContentLoaded", testCompletion, false); + + openConsole(); + + var jsterm = HUDService.getHudByWindow(content).jsterm; + var input = jsterm.inputNode; + + // Test typing 'var d = 5;' and press RETURN + jsterm.setInputValue("var d = "); + EventUtils.synthesizeKey("5", {}); + EventUtils.synthesizeKey(";", {}); + is(input.value, "var d = 5;", "var d = 5;"); + is(jsterm.completeNode.value, "", "no completion"); + EventUtils.synthesizeKey("VK_ENTER", {}); + is(jsterm.completeNode.value, "", "clear completion on execute()"); + + // Test typing 'var a = d' and press RETURN + jsterm.setInputValue("var a = "); + EventUtils.synthesizeKey("d", {}); + is(input.value, "var a = d", "var a = d"); + is(jsterm.completeNode.value, "", "no completion"); + EventUtils.synthesizeKey("VK_ENTER", {}); + is(jsterm.completeNode.value, "", "clear completion on execute()"); + + jsterm = input = null; + finishTest(); +} + diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_completion.js b/browser/devtools/webconsole/test/browser/browser_webconsole_completion.js index cd2793794841..2126d66efb0c 100644 --- a/browser/devtools/webconsole/test/browser/browser_webconsole_completion.js +++ b/browser/devtools/webconsole/test/browser/browser_webconsole_completion.js @@ -74,7 +74,7 @@ function testCompletion() { // Test typing 'document.getElem'. input.value = "document.getElem"; input.setSelectionRange(16, 16); - jsterm.complete(jsterm.COMPLETE_HINT_ONLY); + jsterm.complete(jsterm.COMPLETE_FORWARD); is(input.value, "document.getElem", "'document.getElem' completion"); is(jsterm.completeNode.value, " entById", "'document.getElem' completion");