Bug 583816 - Tab should not move to the page when there's nothing to complete in the Web Console. r=msucan,rcampbell

browser/devtools/webconsole/HUDService.jsm

@@ -5263,6 +5263,10 @@ JSTerm.prototype = {
             this.acceptProposedCompletion()) {
           aEvent.preventDefault();
         }
+        else {
+          this.updateCompleteNode(HUDService.getStr("Autocomplete.blank"));
+          aEvent.preventDefault();
+        }
         break;
 
       default:

browser/devtools/webconsole/test/Makefile.in

@@ -88,7 +88,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_582201_duplicate_errors.js \
 	browser_webconsole_bug_580454_timestamp_l10n.js \
 	browser_webconsole_netlogging.js \
-	browser_webconsole_bug_583816_tab_focus.js \
+	browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js \
 	browser_webconsole_bug_594477_clickable_output.js \
 	browser_webconsole_bug_589162_css_filter.js \
 	browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js \

browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js

@@ -0,0 +1,70 @@
+/* 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 Web Console test suite.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mihai Sucan <mihai.sucan@gmail.com>
+ *   Jignesh Kakadiya <jigneshhk1992@gmail.com>
+ *
+ * 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 ***** */
+
+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;
+
+  jsterm.setInputValue("");
+  EventUtils.synthesizeKey("VK_TAB", {});
+  is(jsterm.completeNode.value, "<- no result", "<- no result - matched");
+  is(input.value, "", "inputnode is empty - matched")
+  is(input.getAttribute("focused"), "true", "input is still focused");
+
+  //Any thing which is not in property autocompleter
+  jsterm.setInputValue("window.Bug583816");
+  EventUtils.synthesizeKey("VK_TAB", {});
+  is(jsterm.completeNode.value, "                <- no result", "completenode content - matched");
+  is(input.value, "window.Bug583816", "inputnode content - matched");
+  is(input.getAttribute("focused"), "true", "input is still focused");
+
+  jsterm = input = null;
+  finishTest();
+}

browser/devtools/webconsole/test/browser_webconsole_bug_583816_tab_focus.js

@@ -1,61 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- *
- * Contributor(s):
- *  Mihai Șucan <mihai.sucan@gmail.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//test-console.html";
-
-let HUD, inputNode;
-
-function tabLoad(aEvent) {
-  browser.removeEventListener(aEvent.type, arguments.callee, true);
-
-  waitForFocus(function() {
-    openConsole();
-
-    HUD = HUDService.getHudByWindow(content);
-
-    inputNode = HUD.jsterm.inputNode;
-
-    inputNode.focus();
-    executeSoon(function() {
-      is(inputNode.getAttribute("focused"), "true", "inputNode is focused");
-      HUD.jsterm.setInputValue("doc");
-      inputNode.addEventListener("keyup", firstTab, false);
-      EventUtils.synthesizeKey("VK_TAB", {});
-    });
-  }, content);
-}
-
-function firstTab(aEvent) {
-  this.removeEventListener(aEvent.type, arguments.callee, false);
-
-  is(inputNode.getAttribute("focused"), "true", "inputNode is still focused");
-  isnot(this.value, "doc", "input autocompleted");
-
-  HUD.jsterm.setInputValue("foobarbaz" + Date.now());
-
-  EventUtils.synthesizeKey("VK_TAB", {});
-
-  executeSoon(secondTab);
-}
-
-function secondTab() {
-  isnot(inputNode.getAttribute("focused"), "true",
-          "inputNode is no longer focused");
-
-  HUD = inputNode = null;
-  HUDService.deactivateHUDForContext(gBrowser.selectedTab);
-  executeSoon(finish);
-}
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", tabLoad, true);
-}
-

browser/locales/en-US/chrome/browser/devtools/webconsole.properties

@@ -171,4 +171,9 @@ timerStarted=%S: timer started
 # %1$S=name of timer, %2$S=number of milliseconds
 timeEnd=%1$S: %2$Sms
 
+# LOCALIZATION NOTE (Autocomplete.blank):
+# This string is used when inputnode string containing anchor doesn't
+# doesn't matches to any property in the content.
+Autocomplete.blank=  <- no result
+
 maxTimersExceeded=The maximum allowed number of timers in this page was exceeded.