Fix #568: loading the tabs module failed (#675)

ma8ma · timss · commit eabb291f1bd0 · 2017-01-31T03:08:20.000-05:00
* Replace legacy generator with ES2015 generator for almost places.
* Replace non-standard Array comprehension with Array methods
  in muttator/content/mail.js.

Several legacy generators still keep because they have been handled
by legacy iterators:
* iter() in common/content/base.js
* callbacks of addPageInfoSection() in common/content/buffer.js
* evaluateXPath() in common/content/util.js
* range() in common/content/util.js
* itervalues() in common/content/util.js
* iteritems() in common/content/util.js
diff --git a/common/content/base.js b/common/content/base.js
@@ -16,27 +16,22 @@ function array(obj) {
     return util.Array(obj);
 }
 
-function allkeys(obj) {
+function* allkeys(obj) {
     for(; obj; obj = obj.__proto__)
         for (let prop of Object.getOwnPropertyNames(obj))
             yield prop;
 }
 
-function keys(obj) {
+function* keys(obj) {
     for (let prop of Object.getOwnPropertyNames(obj))
         yield prop;
 }
 
-function values(obj) {
-    for (var k of Object.keys(obj))
+function* values(obj) {
+    for (let k of Object.keys(obj))
         yield obj[k];
 }
 
-function foreach(iter, fn, self) {
-    for (let val in iter)
-        fn.call(self, val);
-}
-
 function dict(ary) {
     var obj = {};
     for (var i = 0; i < ary.length; i++) {
@@ -227,7 +222,7 @@ function update(target, ...sources) {
         if (!src)
             continue;
 
-        foreach(keys(src), function (k) {
+        for (let k of keys(src)) {
             let desc = Object.getOwnPropertyDescriptor(src, k);
             Object.defineProperty(target, k, desc);
             if (("value" in desc) && callable(desc.value)) {
@@ -243,7 +238,7 @@ function update(target, ...sources) {
                 } else
                     v.superapply = v.supercall = function dummy() {};
             }
-        });
+        }
     }
     return target;
 }
@@ -457,8 +452,8 @@ const StructBase = Class("StructBase", {
 });
 // Add no-sideeffect array methods. Can't set new Array() as the prototype or
 // get length() won't work.
-for (let k in values(["concat", "every", "filter", "forEach", "indexOf", "join", "lastIndexOf",
-                      "map", "reduce", "reduceRight", "reverse", "slice", "some", "sort"]))
+for (let k of ["concat", "every", "filter", "forEach", "indexOf", "join", "lastIndexOf",
+               "map", "reduce", "reduceRight", "reverse", "slice", "some", "sort"])
     StructBase.prototype[k] = Array.prototype[k];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
@@ -471,7 +471,7 @@ const Bookmarks = Module("bookmarks", {
         return node;
 
         function getFolderFromNode (node, title) {
-            for (let child in Bookmarks.iterateFolderChildren(node)) {
+            for (let child of Bookmarks.iterateFolderChildren(node)) {
                 if (child.title == title && child instanceof Ci.nsINavHistoryContainerResultNode) {
                     node.containerOpen = false;
                     return child;
@@ -480,7 +480,7 @@ const Bookmarks = Module("bookmarks", {
             return null;
         }
     },
-    iterateFolderChildren: function (node, onlyFolder, onlyWritable) {
+    iterateFolderChildren: function* (node, onlyFolder, onlyWritable) {
         if (!node.containerOpen)
             node.containerOpen = true;
 
@@ -809,7 +809,7 @@ const Bookmarks = Module("bookmarks", {
                 results.push(["TOOLBAR", "Bookmarks Toolbar"]);
             }
             if (folder) {
-                for (let child in Bookmarks.iterateFolderChildren(folder, onlyFolder, onlyWritable)) {
+                for (let child of Bookmarks.iterateFolderChildren(folder, onlyFolder, onlyWritable)) {
                     if (PlacesUtils.nodeIsSeparator(child))
                         continue;
 
diff --git a/common/content/buffer.js b/common/content/buffer.js
@@ -562,7 +562,7 @@ const Buffer = Module("buffer", {
         synonyms.unshift(rel);
 
         function followFrame(frame) {
-            function iter(elems) {
+            function* iter(elems) {
                 for (let i = 0; i < elems.length; i++)
                     for (let rel of synonyms)
                         if (elems[i].rel.toLowerCase() == rel || elems[i].rev.toLowerCase() == rel)
@@ -571,14 +571,14 @@ const Buffer = Module("buffer", {
 
             // <link>s have higher priority than normal <a> hrefs
             let elems = frame.document.getElementsByTagName("link");
-            for (let elem in iter(elems)) {
+            for (let elem of iter(elems)) {
                 liberator.open(elem.href);
                 return true;
             }
 
             // no links? ok, look for hrefs
             elems = frame.document.getElementsByTagName("a");
-            for (let elem in iter(elems)) {
+            for (let elem of iter(elems)) {
                 buffer.followLink(elem, liberator.CURRENT_TAB);
                 return true;
             }
@@ -1408,7 +1408,7 @@ const Buffer = Module("buffer", {
             };
         }
 
-        function generateTabs (tabs) {
+        function* generateTabs (tabs) {
             for (let i = 0, tab; tab = tabs[i]; i++) {
                 let indicator = getIndicator(tab) + (tab.pinned ? "@" : " "),
                     label = tab.label || UNTITLED_LABEL,
@@ -1425,7 +1425,7 @@ const Buffer = Module("buffer", {
                 yield item;
             }
         }
-        function generateGroupList (group, groupName) {
+        function* generateGroupList (group, groupName) {
             let hasName = !!groupName;
             for (let [i, tabItem] in Iterator(group.getChildren())) {
                 let index = (tabItem.tab._tPos + 1) + ": ",
@@ -1524,7 +1524,7 @@ const Buffer = Module("buffer", {
             "Repeat the last key event",
             function (count) {
                 if (mappings.repeat) {
-                    for (let i in util.interruptibleRange(0, Math.max(count, 1), 100))
+                    for (let i of util.interruptibleRange(0, Math.max(count, 1), 100))
                         mappings.repeat();
                 }
             },
diff --git a/common/content/commandline.js b/common/content/commandline.js
@@ -1842,7 +1842,7 @@ const ItemList = Class("ItemList", {
             nodes.message.style.display = context.message ? "block" : "none";
             nodes.waiting.style.display = waiting ? "block" : "none";
 
-            for (let [i, row] in Iterator(context.getRows(start, end, this._doc)))
+            for (let [i, row] of context.getRows(start, end, this._doc))
                 nodes[i] = row;
             for (let [i, row] in util.Array.iteritems(nodes)) {
                 if (!row)
diff --git a/common/content/commands.js b/common/content/commands.js
@@ -945,7 +945,7 @@ const Commands = Module("commands", {
             ["@:"], "Repeat the last Ex command",
             function (count) {
                 if (commands.repeat) {
-                    for (let i in util.interruptibleRange(0, Math.max(count, 1), 100))
+                    for (let i of util.interruptibleRange(0, Math.max(count, 1), 100))
                         liberator.execute(commands.repeat);
                 }
                 else
diff --git a/common/content/completion.js b/common/content/completion.js
@@ -495,7 +495,7 @@ const CompletionContext = Class("CompletionContext", {
         return util.map(util.range(start, end, step), function (i) items[i]);
     },
 
-    getRows: function getRows(start, end, doc) {
+    getRows: function* getRows(start, end, doc) {
         let self = this;
         let items = this.items;
         let cache = this.cache.rows;
diff --git a/common/content/events.js b/common/content/events.js
@@ -82,7 +82,7 @@ const Events = Module("events", {
                     for (let dir of dirs) {
                          liberator.log("Sourcing macros directory: " + dir.path);
 
-                        for (let file in dir.iterDirectory()) {
+                        for (let file of dir.iterDirectory()) {
                             if (file.exists() && !file.isDirectory() && file.isReadable() &&
                                 /^[\w_-]+(\.vimp)?$/i.test(file.leafName)) {
                                 let name = file.leafName.replace(/\.vimp$/i, "");
@@ -134,7 +134,7 @@ const Events = Module("events", {
 
     destroy: function () {
         liberator.log("Removing all event listeners");
-        for (let args in values(this.sessionListeners))
+        for (let args of values(this.sessionListeners))
             args[0].removeEventListener.apply(args[0], args.slice(1));
     },
 
diff --git a/common/content/hints.js b/common/content/hints.js
@@ -446,7 +446,7 @@ const Hints = Module("hints", {
                 continue;
 
         inner:
-            for (let i in (util.interruptibleRange(start, end + 1, 500))) {
+            for (let i of (util.interruptibleRange(start, end + 1, 500))) {
                 let hint = this._pageHints[i];
 
                 let valid = validHint(hint.text);
diff --git a/common/content/io.js b/common/content/io.js
@@ -69,7 +69,7 @@ const File = Class("File", {
     /**
      * Iterates over the objects in this directory.
      */
-    iterDirectory: function () {
+    iterDirectory: function* () {
         if (!this.isDirectory())
             throw Error("Not a directory");
         let entries = this.directoryEntries;
diff --git a/common/content/javascript.js b/common/content/javascript.js
@@ -32,14 +32,14 @@ const JavaScript = Module("javascript", {
         }
     },
 
-    iter: function iter(obj, toplevel) {
+    iter: function* iter(obj, toplevel) {
         toplevel = !!toplevel;
         let seen = {};
 
         try {
             let orig = obj;
 
-            function iterObj(obj, toplevel) {
+            function* iterObj(obj, toplevel) {
                 if (Cu.isXrayWrapper(obj)) {
                     if (toplevel) {
                         yield {get wrappedJSObject() 0};
@@ -62,7 +62,7 @@ const JavaScript = Module("javascript", {
                         yield o;
             }
 
-            for (let obj in iterObj(orig, toplevel)) {
+            for (let obj of iterObj(orig, toplevel)) {
                 try {
                     for (let k of Object.getOwnPropertyNames(obj)) {
                         let name = "|" + k;
diff --git a/common/content/liberator.js b/common/content/liberator.js
@@ -1639,7 +1639,7 @@ const Liberator = Module("liberator", {
                         let each, eachUnits, totalUnits;
                         let total = 0;
 
-                        for (let i in util.interruptibleRange(0, count, 500)) {
+                        for (let i of util.interruptibleRange(0, count, 500)) {
                             let now = Date.now();
                             method();
                             total += Date.now() - now;
diff --git a/common/content/marks.js b/common/content/marks.js
@@ -276,7 +276,7 @@ const Marks = Module("marks", {
 
                     // check for illegal ranges - only allow a-z A-Z
                     if (matches = args.match(/[a-zA-Z]-[a-zA-Z]/g)) {
-                        for (let match in values(matches)) {
+                        for (let match of values(matches)) {
                             liberator.assert(/[a-z]-[a-z]|[A-Z]-[A-Z]/.test(match) &&
                                     match[0] <= match[2],
                                     "Invalid argument: " + args.match(match + ".*")[0]);
diff --git a/common/content/options.js b/common/content/options.js
@@ -946,7 +946,7 @@ const Options = Module("options", {
                         commandline.input("Warning: Resetting all preferences may make " + config.hostApplication + " unusable. Continue (yes/[no]): ",
                             function (resp) {
                                 if (resp == "yes")
-                                    for (let pref in values(options.allPrefs()))
+                                    for (let pref of values(options.allPrefs()))
                                         options.resetPref(pref);
                             },
                             { promptHighlight: "WarningMsg" });
diff --git a/common/content/tabs.js b/common/content/tabs.js
@@ -49,13 +49,15 @@ const Tabs = Module("tabs", {
     },
 
     /**
-     * @property {Iterator(Object)} A genenerator that returns all browsers
+     * @property {Generator} A genenerator that returns all browsers
      *     in the current window.
      */
     get browsers() {
-        let browsers = config.tabbrowser.browsers;
-        for (let i = 0; i < browsers.length; i++)
-            yield [i, browsers[i]];
+        return (function* () {
+            let browsers = config.tabbrowser.browsers;
+            for (let i = 0; i < browsers.length; i++)
+                yield [i, browsers[i]];
+        })();
     },
 
     /**
@@ -130,7 +132,7 @@ const Tabs = Module("tabs", {
     //      : unused? Remove me.
     get: function () {
         let buffers = [];
-        for (let [i, browser] in this.browsers) {
+        for (let [i, browser] of this.browsers) {
             let title = browser.contentTitle || "(Untitled)";
             let uri = browser.currentURI.spec;
             let number = i + 1;
@@ -147,7 +149,7 @@ const Tabs = Module("tabs", {
      */
     // FIXME: Only called once...necessary?
     getContentIndex: function (content) {
-        for (let [i, browser] in this.browsers) {
+        for (let [i, browser] of this.browsers) {
             if (browser.contentWindow == content || browser.contentDocument == content)
                 return i;
         }
@@ -387,7 +389,7 @@ const Tabs = Module("tabs", {
      * Stops loading all tabs.
      */
     stopAll: function () {
-        for (let [, browser] in this.browsers)
+        for (let [, browser] of this.browsers)
             browser.stop();
     },
 
@@ -424,7 +426,7 @@ const Tabs = Module("tabs", {
         let lowerBuffer = buffer.toLowerCase();
         let first = tabs.index();
         let nbrowsers = config.tabbrowser.browsers.length;
-        for (let [i, ] in tabs.browsers) {
+        for (let [i, ] of tabs.browsers) {
             let index = (i + first) % nbrowsers;
             let browser = config.tabbrowser.browsers[index];
             let tab = tabs.getTab(index);
diff --git a/common/content/util.js b/common/content/util.js
@@ -638,7 +638,7 @@ const Util = Module("util", {
      * @param {number} time The time in milliseconds between thread yields.
      * @returns {Iterator(Object)}
      */
-    interruptibleRange: function interruptibleRange(start, end, time) {
+    interruptibleRange: function* interruptibleRange(start, end, time) {
         let endTime = Date.now() + time;
         while (start < end) {
             if (Date.now() > endTime) {
diff --git a/muttator/content/mail.js b/muttator/content/mail.js
diff --git a/vimperator/NEWS b/vimperator/NEWS

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ const Commands = Module("commands", {`
`945`	`945`	`["@:"], "Repeat the last Ex command",`
`946`	`946`	`function (count) {`
`947`	`947`	`if (commands.repeat) {`
`948`		`- for (let i in util.interruptibleRange(0, Math.max(count, 1), 100))`
	`948`	`+ for (let i of util.interruptibleRange(0, Math.max(count, 1), 100))`
`949`	`949`	`liberator.execute(commands.repeat);`
`950`	`950`	`}`
`951`	`951`	`else`