Skip to content

Commit 68ae0c1

Browse files
Grisha Pushkovgkatsev
Grisha Pushkov
authored and
gkatsev
committed
Remove commented asserts (#493)
1 parent 08838f5 commit 68ae0c1

File tree

19 files changed

+13
-727
lines changed

19 files changed

+13
-727
lines changed

‎common/content/abbreviations.js

Lines changed: 9 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,9 @@ const Abbreviations = Module("abbreviations", {
130130
*/
131131
get merged() {
132132
let result = [];
133-
134-
/* assert start */
135-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
136-
//
137-
// let before = util.Array.uniq([lhs for ([, mabbrevs] in Iterator(this.abbrevs)) for (lhs of Object.keys(mabbrevs))].sort());
138-
// let after = util.Array.uniq(
139-
// Array.from(values(this.abbrevs))
140-
// .reduce((abbrevs, mabbrev) => [...abbrevs, ...Object.keys(mabbrev)], [])
141-
// );
142-
//
143-
// assert(JSON.stringify(before) == JSON.stringify(after), '#1 in abbrevations.js');
144-
/* assert end */
145-
146133
let lhses = util.Array.uniq(
147-
Array.from(values(this.abbrevs))
148-
.reduce((abbrevs, mabbrev) => [...abbrevs, ...Object.keys(mabbrev)], [])
134+
Array.from(values(this.abbrevs))
135+
.reduce((abbrevs, mabbrev) => [...abbrevs, ...Object.keys(mabbrev)], [])
149136
);
150137

151138
for (let lhs of lhses) {
@@ -224,16 +211,6 @@ const Abbreviations = Module("abbreviations", {
224211
completion.abbreviation = function abbreviation(context, args, modes) {
225212
if (args.completeArg == 0) {
226213
let abbrevs = abbreviations.merged.filter(function (abbr) abbr.inModes(modes));
227-
228-
/* assert start */
229-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
230-
//
231-
// let before = [[abbr.lhs, abbr.rhs] for (abbr of abbrevs)];
232-
// let after = abbrevs.map(abbr => [abbr.lhs, abbr.rhs]);
233-
//
234-
// assert(JSON.stringify(before) == JSON.stringify(after), '#2 in abbreviations.js');
235-
/* assert end */
236-
237214
context.completions = abbrevs.map(abbr => [abbr.lhs, abbr.rhs]);
238215
}
239216
};
@@ -276,39 +253,14 @@ const Abbreviations = Module("abbreviations", {
276253
},
277254
literal: 0,
278255
serial: function () {
279-
/* assert start */
280-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
281-
//
282-
// let before = [
283-
// {
284-
// command: this.name,
285-
// arguments: [abbr.lhs],
286-
// literalArg: abbr.rhs,
287-
// options: abbr.rhs instanceof Function ? {"-javascript": null} : {}
288-
// }
289-
// for ([, abbr] in Iterator(abbreviations.merged))
290-
// if (abbr.modesEqual(modes))
291-
// ];
292-
// let after = abbreviations.merged
293-
// .filter(abbr => abbr.modesEqual(modes))
294-
// .map(abbr => ({
295-
// command: this.name,
296-
// arguments: [abbr.lhs],
297-
// literalArg: abbr.rhs,
298-
// options: abbr.rhs instanceof Function ? {"-javascript": null} : {}
299-
// }));
300-
//
301-
// assert(JSON.stringify(before) == JSON.stringify(after), '#3 in abbreviations.js');
302-
/* assert end */
303-
304256
return abbreviations.merged
305-
.filter(abbr => abbr.modesEqual(modes))
306-
.map(abbr => ({
307-
command: this.name,
308-
arguments: [abbr.lhs],
309-
literalArg: abbr.rhs,
310-
options: abbr.rhs instanceof Function ? {"-javascript": null} : {}
311-
}));
257+
.filter(abbr => abbr.modesEqual(modes))
258+
.map(abbr => ({
259+
command: this.name,
260+
arguments: [abbr.lhs],
261+
literalArg: abbr.rhs,
262+
options: abbr.rhs instanceof Function ? {"-javascript": null} : {}
263+
}));
312264
}
313265
});
314266

‎common/content/autocommands.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,17 +256,6 @@ const AutoCommands = Module("autocommands", {
256256

257257
completion.macro = function macro(context) {
258258
context.title = ["Macro", "Keys"];
259-
260-
// NOTE: was unable to execute this assert
261-
/* assert start */
262-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
263-
//
264-
// let before = [item for (item in events.getMacros())];
265-
// let after = Array.from(events.getMacros());
266-
//
267-
// assert(JSON.stringify(before) == JSON.stringify(after), '#1 in autocommands.js');
268-
/* assert end */
269-
270259
context.completions = Array.from(events.getMacros());
271260
};
272261
},

‎common/content/base.js

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@ const Cu = Components.utils;
1010

1111
function array(obj) {
1212
if (isgenerator(obj))
13-
/* assert start */
14-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
15-
//
16-
// let original = Array.from(obj);
17-
// obj = iter(original);
18-
// let before = [k for (k in obj)];
19-
// obj = iter(original);
20-
// let after = Array.from(obj);
21-
//
22-
// assert(JSON.stringify(before) == JSON.stringify(after), '#1 in base.js');
23-
/* assert end */
24-
2513
obj = Array.from(obj);
2614
else if (obj.length)
2715
obj = Array.slice(obj);
@@ -78,19 +66,6 @@ function iter(obj) {
7866
catch (e) {}
7967
})();
8068
if (isinstance(obj, [HTMLCollection, NodeList]))
81-
/* assert start */
82-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
83-
//
84-
// let before = (node for (node of obj));
85-
// let after = (function* () {
86-
// for (node of obj) {
87-
// yield node;
88-
// }
89-
// })();
90-
//
91-
// assert(JSON.stringify(Array.from(before)) == JSON.stringify(Array.from(after)), '#2 in base.js');
92-
/* assert end */
93-
9469
return (function* () {
9570
for (node of obj) {
9671
yield node;
@@ -435,16 +410,6 @@ const StructBase = Class("StructBase", {
435410
// Iterator over our named members
436411
__iterator__: function () {
437412
let self = this;
438-
439-
/* assert start */
440-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
441-
//
442-
// let before = ([k, self[i]] for ([i, k] in Iterator(self.members)));
443-
// let after = iter(Object.keys(self.members).map(i => [self.members[i], self[i]]));
444-
//
445-
// assert(JSON.stringify(Array.from(before)) == JSON.stringify(Array.from(after)), '#3 in base.js');
446-
/* assert end */
447-
448413
return iter(Object.keys(self.members).map(i => [self.members[i], self[i]]));
449414
}
450415
}, {

‎common/content/buffer.js

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ const Buffer = Module("buffer", {
314314
* buffer. Only returns style sheets for the 'screen' media type.
315315
*/
316316
get alternateStyleSheets() {
317-
// NOTE: getAllStyleSheets seems to be not supported
318317
let stylesheets = window.getAllStyleSheets(config.browser.contentWindow);
319318

320319
return stylesheets.filter(
@@ -1045,7 +1044,7 @@ const Buffer = Module("buffer", {
10451044
if ("FullZoom" in window)
10461045
FullZoom._applyZoomToPref(browser);
10471046
liberator.echomsg((fullZoom ? "Full" : "Text") + " zoom: " + value + "%");
1048-
1047+
10491048
statusline.updateField("zoomlevel", value);
10501049
},
10511050

@@ -1371,17 +1370,6 @@ const Buffer = Module("buffer", {
13711370

13721371
styles[style.title].push(style.href || "inline");
13731372
});
1374-
1375-
// NOTE: was unable to execute this assert
1376-
/* assert start */
1377-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
1378-
//
1379-
// let before = [[s, styles[s].join(", ")] for (s in styles)];
1380-
// let after = Object.keys(styles).map(s => [s, styles[s].join(", ")]);
1381-
//
1382-
// assert(JSON.stringify(before) == JSON.stringify(after), '#1 in buffer.js');
1383-
/* assert end */
1384-
13851373
context.completions = Object.keys(styles).map(s => [s, styles[s].join(", ")]);
13861374
};
13871375

@@ -1468,17 +1456,6 @@ const Buffer = Module("buffer", {
14681456

14691457
if (flags & this.buffer.VISIBLE) {
14701458
context.title = ["Buffers"];
1471-
1472-
/* assert start */
1473-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
1474-
//
1475-
// let before = [item for (item in generateTabs(tabs || config.tabbrowser.visibleTabs))];
1476-
// let after = Array.from(generateTabs(tabs || config.tabbrowser.visibleTabs));
1477-
//
1478-
// dump(JSON.stringify(before));
1479-
// assert(JSON.stringify(before) == JSON.stringify(after), '#2 in buffer.js');
1480-
/* assert end */
1481-
14821459
context.completions = Array.from(generateTabs(tabs || config.tabbrowser.visibleTabs));
14831460
}
14841461

@@ -1692,23 +1669,6 @@ const Buffer = Module("buffer", {
16921669
"textarea[not(@disabled) and not(@readonly)]",
16931670
"iframe"];
16941671

1695-
/* assert start */
1696-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
1697-
//
1698-
// let after = [];
1699-
// for (m in util.evaluateXPath(xpath)) {
1700-
// if (m.getClientRects().length
1701-
// && (!(m instanceof HTMLIFrameElement) || Editor.windowIsEditable(m.contentWindow)))
1702-
// after.push(m);
1703-
// }
1704-
// let before = [m for (m in util.evaluateXPath(xpath))
1705-
// if(m.getClientRects().length && (!(m instanceof HTMLIFrameElement) || Editor.windowIsEditable(m.contentWindow)))
1706-
// ];
1707-
//
1708-
// assert(JSON.stringify(before) == JSON.stringify(after), '#3 in buffer.js');
1709-
/* assert end */
1710-
1711-
// NOTE: Array.from doesn't work here
17121672
let elements = [];
17131673
for (let m in util.evaluateXPath(xpath)) {
17141674
if (m.getClientRects().length
@@ -1838,15 +1798,6 @@ const Buffer = Module("buffer", {
18381798
"charlist", "gfm",
18391799
{
18401800
completer: function (context) {
1841-
/* assert start */
1842-
// function assert(condition, bookmark) { dump(bookmark+': '); if (!condition) dump('FAILED\n'); else dump('PASSED\n'); }
1843-
//
1844-
// let before = [[k, v[1]] for ([k, v] in Iterator(buffer.pageInfo))];
1845-
// let after = Object.keys(buffer.pageInfo).map(k => [k, buffer.pageInfo[k][1]]);
1846-
//
1847-
// assert(JSON.stringify(before) == JSON.stringify(after), '#4 in buffer.js');
1848-
/* assert end */
1849-
18501801
return Object.keys(buffer.pageInfo).map(k => [k, buffer.pageInfo[k][1]]);
18511802
}
18521803
});

0 commit comments

Comments
 (0)