Move to clang-format-6.0
The docker image moved from clang-format-5.0 to clang-format-6.0.
Change-Id: I3c615d7df1f21569531b4dc2cb0bc4f425cb43f8
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/vendors/hterm/hterm_all.js b/app/vendors/hterm/hterm_all.js
index a4b6fbf..4c4deb8 100644
--- a/app/vendors/hterm/hterm_all.js
+++ b/app/vendors/hterm/hterm_all.js
@@ -2027,7 +2027,6 @@
*/
lib.PreferenceManager.prototype.definePreference = function(
name, value, opt_onChange) {
-
var record = this.prefRecords_[name];
if (record) {
this.changeDefault(name, value);
@@ -2072,7 +2071,6 @@
*/
lib.PreferenceManager.prototype.defineChildren = function(
listName, childFactory) {
-
// Define a preference to hold the ordered list of child ids.
this.definePreference(
listName, [], this.onChildListChange_.bind(this, listName));
@@ -2286,7 +2284,6 @@
*/
lib.PreferenceManager.prototype.syncChildList = function(
listName, opt_callback) {
-
var pendingChildren = 0;
function onChildStorage() {
@@ -3691,7 +3688,6 @@
// List of pending test cases.
this.testQueue_ = [];
-
};
/**
@@ -3766,7 +3762,6 @@
*/
lib.TestManager.TestRun.prototype.onUncaughtException_ = function(
message, file, line) {
-
if (message.indexOf('Uncaught lib.TestManager.Result.TestComplete') == 0 ||
message.indexOf('status: passed') != -1) {
// This is a result.pass() or result.fail() call from a callback. We're
@@ -7187,7 +7182,6 @@
}
throw this.error('Expected string or identifier');
-
};
hterm.Parser.prototype.peekString = function() {
diff --git a/app/vendors/hterm/hterm_all.min.js b/app/vendors/hterm/hterm_all.min.js
index 8039c16..e950d5e 100644
--- a/app/vendors/hterm/hterm_all.min.js
+++ b/app/vendors/hterm/hterm_all.min.js
@@ -1000,7 +1000,7 @@
var o = new XMLHttpRequest;
o.onloadend = function() {
return 200 != o.status ?
- void(r && r(o.status)) :
+ void (r && r(o.status)) :
(this.addMessages(JSON.parse(o.responseText)), void t());
}.bind(this), o.open('GET', e), o.send();
};
@@ -1227,7 +1227,7 @@
var r = this.prefRecords_[e];
if (!r) throw new Error('Unknown preference: ' + e);
if (this.diff(r.defaultValue, t)) {
- if (r.currentValue !== this.DEFAULT_VALUE) return void(r.defaultValue = t);
+ if (r.currentValue !== this.DEFAULT_VALUE) return void (r.defaultValue = t);
r.defaultValue = t, this.notifyChange_(e);
}
};
@@ -3445,7 +3445,7 @@
o;) {
var s = t - i, n = hterm.TextAttributes.nodeWidth(o);
if (!o.nextSibling || n > s)
- return this.cursorNode_ = o, void(this.cursorOffset_ = s);
+ return this.cursorNode_ = o, void (this.cursorOffset_ = s);
i += n, o = o.nextSibling;
}
};
@@ -3465,7 +3465,7 @@
, hterm.Screen.prototype.maybeClipCurrentRow = function() {
var e = hterm.TextAttributes.nodeWidth(this.cursorRowNode_);
if (e <= this.columnCount_)
- return void(
+ return void (
this.cursorPosition.column >= this.columnCount_ &&
(this.setCursorPosition(this.cursorPosition.row, this.columnCount_ - 1),
this.cursorPosition.overflow = !0));
@@ -3509,26 +3509,26 @@
t.textContent = e + r :
t.textContent = hterm.TextAttributes.nodeSubstr(t, 0, i) +
e + hterm.TextAttributes.nodeSubstr(t, i),
- void(this.cursorOffset_ += o);
+ void (this.cursorOffset_ += o);
if (0 == i) {
var l = t.previousSibling;
if (l && this.textAttributes.matchesContainer(l))
return l.textContent += e,
this.cursorNode_ = l,
- void(this.cursorOffset_ = lib.wc.strWidth(l.textContent));
+ void (this.cursorOffset_ = lib.wc.strWidth(l.textContent));
var h = this.textAttributes.createContainer(e);
- return this.cursorRowNode_.insertBefore(h, t), this.cursorNode_ = h,
- void(this.cursorOffset_ = o);
+ return this.cursorRowNode_.insertBefore(h, t),
+ this.cursorNode_ = h, void (this.cursorOffset_ = o);
}
if (0 == s) {
var c = t.nextSibling;
if (c && this.textAttributes.matchesContainer(c))
return c.textContent = e + c.textContent, this.cursorNode_ = c,
- void(this.cursorOffset_ = lib.wc.strWidth(e));
+ void (this.cursorOffset_ = lib.wc.strWidth(e));
var h = this.textAttributes.createContainer(e);
return this.cursorRowNode_.insertBefore(h, c),
this.cursorNode_ = h,
- void(this.cursorOffset_ = hterm.TextAttributes.nodeWidth(h));
+ void (this.cursorOffset_ = hterm.TextAttributes.nodeWidth(h));
}
this.splitNode_(t, i);
var h = this.textAttributes.createContainer(e);
@@ -3541,7 +3541,7 @@
var r = lib.wc.strWidth(e);
return this.textAttributes.matchesContainer(this.cursorNode_) &&
this.cursorNode_.textContent.substr(this.cursorOffset_) == e ?
- (this.cursorOffset_ += r, void(this.cursorPosition.column += r)) :
+ (this.cursorOffset_ += r, void (this.cursorPosition.column += r)) :
(this.deleteChars(Math.min(r, t)), void this.insertString(e));
};
, hterm.Screen.prototype.deleteChars = function(e) {
@@ -3972,7 +3972,7 @@
};
, hterm.ScrollPort.prototype.drawTopFold_ = function(e) {
if (!this.selection.startRow || this.selection.startRow.rowIndex >= e)
- return void(
+ return void (
this.rowNodes_.firstChild != this.topFold_ &&
this.rowNodes_.insertBefore(this.topFold_, this.rowNodes_.firstChild));
if (!this.selection.isMultiline || this.selection.endRow.rowIndex >= e)
@@ -3990,7 +3990,7 @@
};
, hterm.ScrollPort.prototype.drawBottomFold_ = function(e) {
if (!this.selection.endRow || this.selection.endRow.rowIndex <= e)
- return void(
+ return void (
this.rowNodes_.lastChild != this.bottomFold_ &&
this.rowNodes_.appendChild(this.bottomFold_));
if (!this.selection.isMultiline || this.selection.startRow.rowIndex <= e)
@@ -4565,7 +4565,7 @@
};
, hterm.Terminal.prototype.syncMousePasteButton = function() {
var e = this.prefs_.get('mouse-paste-button');
- if ('number' == typeof e) return void(this.mousePasteButton = e);
+ if ('number' == typeof e) return void (this.mousePasteButton = e);
var t = navigator.userAgent.match(/\(X11;\s+(\S+)/);
t && 'CrOS' != t[2] ? this.mousePasteButton = 3 : this.mousePasteButton = 2;
};
@@ -4573,7 +4573,7 @@
var e = this.prefs_.get('enable-bold');
if (null !== e)
return this.primaryScreen_.textAttributes.enableBold = e,
- void(this.alternateScreen_.textAttributes.enableBold = e);
+ void (this.alternateScreen_.textAttributes.enableBold = e);
var t = this.scrollPort_.measureCharacterSize(),
r = this.scrollPort_.measureCharacterSize('bold'), o = t.equals(r);
o ||
@@ -4621,7 +4621,7 @@
};
, hterm.Terminal.prototype.setWidth = function(e) {
return null == e ?
- void(this.div_.style.width = '100%') :
+ void (this.div_.style.width = '100%') :
(this.div_.style.width = Math.ceil(
this.scrollPort_.characterSize.width * e +
this.scrollPort_.currentScrollbarWidthPx) +
@@ -4630,7 +4630,7 @@
void this.scheduleSyncCursorPosition_());
};
, hterm.Terminal.prototype.setHeight = function(e) {
- return null == e ? void(this.div_.style.height = '100%') :
+ return null == e ? void (this.div_.style.height = '100%') :
(this.div_.style.height =
this.scrollPort_.characterSize.height * e + 'px',
this.realizeSize_(this.screenSize.width, e),
@@ -5192,7 +5192,7 @@
return this.timeouts_.cursorBlink &&
(clearTimeout(this.timeouts_.cursorBlink),
delete this.timeouts_.cursorBlink),
- void(this.cursorNode_.style.opacity = '0');
+ void (this.cursorNode_.style.opacity = '0');
if (this.syncCursorPosition_(), this.cursorNode_.style.opacity = '1',
this.options_.cursorBlink) {
if (this.timeouts_.cursorBlink) return;
@@ -5207,7 +5207,7 @@
t = this.scrollPort_.getBottomRowIndex(e),
r = this.scrollbackRows_.length + this.screen_.cursorPosition.row;
if (r > t)
- return void(
+ return void (
this.cursorNode_.style.top =
-this.scrollPort_.characterSize.height + 'px');
this.options_.cursorVisible && 'none' == this.cursorNode_.style.display &&
@@ -5408,7 +5408,7 @@
this.copySelectionToClipboard(this.document_)),
'click' == e.type && !e.shiftKey && e.ctrlKey)
return clearTimeout(this.timeouts_.openUrl),
- void(
+ void (
this.timeouts_.openUrl =
setTimeout(this.openSelectedUrl_.bind(this), 500));
'mousedown' == e.type && e.which == this.mousePasteButton &&
@@ -5464,7 +5464,7 @@
};
, hterm.Terminal.prototype.onCursorBlink_ = function() {
return this.options_.cursorBlink ?
- void(
+ void (
'false' == this.cursorNode_.getAttribute('focus') ||
'0' == this.cursorNode_.style.opacity ?
(this.cursorNode_.style.opacity = '1',
@@ -5865,14 +5865,14 @@
var o = hterm.VT[e][t];
return o ?
o == hterm.VT.ignore ?
- void(
+ void (
this.warnUnimplemented &&
console.warn('Ignored ' + e + ' code: ' + JSON.stringify(t))) :
'CC1' == e && t > '' && !this.enable8BitControl ?
void console.warn(
'Ignoring 8-bit control code: 0x' + t.charCodeAt(0).toString(16)) :
void o.apply(this, [r, t]) :
- void(
+ void (
this.warnUnimplemented &&
console.warn('Unknown ' + e + ' code: ' + JSON.stringify(t)))
};