chore: runs clang format on all files (google#5627)

mark-friedman · Oct 21, 2021 · 0f3c063 · 0f3c063
1 parent 6dc0f90
commit 0f3c063
Show file tree

Hide file tree

Showing 36 changed files with 209 additions and 130 deletions.
diff --git a/core/block.js b/core/block.js
@@ -1123,7 +1123,8 @@ Block.prototype.getVarModels = function() {
 Block.prototype.updateVarName = function(variable) {
  for (let i = 0, input; (input = this.inputList[i]); i++) {
  for (let j = 0, field; (field = input.fieldRow[j]); j++) {
- if (field.referencesVariables() && variable.getId() === field.getValue()) {
+ if (field.referencesVariables() &&
+ variable.getId() === field.getValue()) {
  field.refreshVariableName();
  }
  }

diff --git a/core/blockly.js b/core/blockly.js
@@ -748,8 +748,7 @@ exports.zelos = zelos;
 // accessors on one copy would call get/set functions on the other
 // copy!)
 if (globalThis.goog && globalThis.Blockly &&
- typeof globalThis.Blockly === 'object' &&
- globalThis.Blockly !== exports) {
+ typeof globalThis.Blockly === 'object' && globalThis.Blockly !== exports) {
  const descriptors = Object.getOwnPropertyDescriptors(exports);
  const accessors = {};
  for (const key in descriptors) {

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
@@ -604,7 +604,7 @@ const registerHelp = function() {
  scope) {
  const block = scope.block;
  const url = (typeof block.helpUrl === 'function') ? block.helpUrl() :
- block.helpUrl;
+  block.helpUrl;
  if (url) {
  return 'enabled';
  }

diff --git a/core/css.js b/core/css.js
@@ -39,8 +39,8 @@ const register = function(cssContent) {
 
  if (Array.isArray(cssContent)) {
  deprecation.warn(
- 'Registering CSS by passing an array of strings', 'September 2021',
- 'September 2022', 'css.register passing a multiline string');
+  'Registering CSS by passing an array of strings', 'September 2021',
+  'September 2022', 'css.register passing a multiline string');
  content += ('\n' + cssContent.join('\n'));
  } else {
  // Add new cssContent in the global content.

diff --git a/core/events/events.js b/core/events/events.js
@@ -145,4 +145,3 @@ Object.defineProperties(exports, {
  },
  },
 });
-
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
@@ -139,7 +139,8 @@ BlockChange.prototype.run = function(forward) {
  block.domToMutation(
  Xml.textToDom(/** @type {string} */ (value) || '<mutation/>'));
  }
- eventUtils.fire(new BlockChange(block, 'mutation', null, oldState, value));
+ eventUtils.fire(
+ new BlockChange(block, 'mutation', null, oldState, value));
  break;
  }
  default:

diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
@@ -50,8 +50,8 @@ const BlockCreate = function(opt_block) {
  * JSON representation of the block that was just created.
  * @type {!blocks.State}
  */
- this.json = /** @type {!blocks.State} */ (blocks.save(
- opt_block, {addCoordinates: true}));
+ this.json = /** @type {!blocks.State} */ (
+ blocks.save(opt_block, {addCoordinates: true}));
 };
 object.inherits(BlockCreate, BlockBase);
 

diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
@@ -59,8 +59,8 @@ const BlockDelete = function(opt_block) {
  * JSON representation of the block that was just deleted.
  * @type {!blocks.State}
  */
- this.oldJson = /** @type {!blocks.State} */ (blocks.save(
- opt_block, {addCoordinates: true}));
+ this.oldJson = /** @type {!blocks.State} */ (
+ blocks.save(opt_block, {addCoordinates: true}));
 };
 object.inherits(BlockDelete, BlockBase);
 
@@ -95,7 +95,7 @@ BlockDelete.prototype.fromJson = function(json) {
  this.oldXml = Xml.textToDom(json['oldXml']);
  this.ids = json['ids'];
  this.wasShadow =
- json['wasShadow'] || this.oldXml.tagName.toLowerCase() === 'shadow';
+  json['wasShadow'] || this.oldXml.tagName.toLowerCase() === 'shadow';
  this.oldJson = /** @type {!blocks.State} */ (json['oldJson']);
  if (json['recordUndo'] !== undefined) {
  this.recordUndo = json['recordUndo'];

diff --git a/core/events/events_comment_change.js b/core/events/events_comment_change.js
@@ -97,6 +97,7 @@ CommentChange.prototype.run = function(forward) {
  comment.setContent(contents);
 };
 
-registry.register(registry.Type.EVENT, eventUtils.COMMENT_CHANGE, CommentChange);
+registry.register(
+ registry.Type.EVENT, eventUtils.COMMENT_CHANGE, CommentChange);
 
 exports.CommentChange = CommentChange;
diff --git a/core/events/events_comment_create.js b/core/events/events_comment_create.js
@@ -76,6 +76,7 @@ CommentCreate.prototype.run = function(forward) {
  CommentBase.CommentCreateDeleteHelper(this, forward);
 };
 
-registry.register(registry.Type.EVENT, eventUtils.COMMENT_CREATE, CommentCreate);
+registry.register(
+ registry.Type.EVENT, eventUtils.COMMENT_CREATE, CommentCreate);
 
 exports.CommentCreate = CommentCreate;
diff --git a/core/events/events_comment_delete.js b/core/events/events_comment_delete.js
@@ -73,6 +73,7 @@ CommentDelete.prototype.run = function(forward) {
  CommentBase.CommentCreateDeleteHelper(this, !forward);
 };
 
-registry.register(registry.Type.EVENT, eventUtils.COMMENT_DELETE, CommentDelete);
+registry.register(
+ registry.Type.EVENT, eventUtils.COMMENT_DELETE, CommentDelete);
 
 exports.CommentDelete = CommentDelete;
diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
@@ -100,6 +100,7 @@ ViewportChange.prototype.fromJson = function(json) {
  this.oldScale = json['oldScale'];
 };
 
-registry.register(registry.Type.EVENT, eventUtils.VIEWPORT_CHANGE, ViewportChange);
+registry.register(
+ registry.Type.EVENT, eventUtils.VIEWPORT_CHANGE, ViewportChange);
 
 exports.ViewportChange = ViewportChange;
diff --git a/core/field_colour.js b/core/field_colour.js
@@ -255,25 +255,85 @@ FieldColour.prototype.getText = function() {
  */
 FieldColour.COLOURS = [
  // grays
- '#ffffff', '#cccccc', '#c0c0c0', '#999999', '#666666', '#333333', '#000000',
+ '#ffffff',
+ '#cccccc',
+ '#c0c0c0',
+ '#999999',
+ '#666666',
+ '#333333',
+ '#000000',
  // reds
- '#ffcccc', '#ff6666', '#ff0000', '#cc0000', '#990000', '#660000', '#330000',
+ '#ffcccc',
+ '#ff6666',
+ '#ff0000',
+ '#cc0000',
+ '#990000',
+ '#660000',
+ '#330000',
  // oranges
- '#ffcc99', '#ff9966', '#ff9900', '#ff6600', '#cc6600', '#993300', '#663300',
+ '#ffcc99',
+ '#ff9966',
+ '#ff9900',
+ '#ff6600',
+ '#cc6600',
+ '#993300',
+ '#663300',
  // yellows
- '#ffff99', '#ffff66', '#ffcc66', '#ffcc33', '#cc9933', '#996633', '#663333',
+ '#ffff99',
+ '#ffff66',
+ '#ffcc66',
+ '#ffcc33',
+ '#cc9933',
+ '#996633',
+ '#663333',
  // olives
- '#ffffcc', '#ffff33', '#ffff00', '#ffcc00', '#999900', '#666600', '#333300',
+ '#ffffcc',
+ '#ffff33',
+ '#ffff00',
+ '#ffcc00',
+ '#999900',
+ '#666600',
+ '#333300',
  // greens
- '#99ff99', '#66ff99', '#33ff33', '#33cc00', '#009900', '#006600', '#003300',
+ '#99ff99',
+ '#66ff99',
+ '#33ff33',
+ '#33cc00',
+ '#009900',
+ '#006600',
+ '#003300',
  // turquoises
- '#99ffff', '#33ffff', '#66cccc', '#00cccc', '#339999', '#336666', '#003333',
+ '#99ffff',
+ '#33ffff',
+ '#66cccc',
+ '#00cccc',
+ '#339999',
+ '#336666',
+ '#003333',
  // blues
- '#ccffff', '#66ffff', '#33ccff', '#3366ff', '#3333ff', '#000099', '#000066',
+ '#ccffff',
+ '#66ffff',
+ '#33ccff',
+ '#3366ff',
+ '#3333ff',
+ '#000099',
+ '#000066',
  // purples
- '#ccccff', '#9999ff', '#6666cc', '#6633ff', '#6600cc', '#333399', '#330099',
+ '#ccccff',
+ '#9999ff',
+ '#6666cc',
+ '#6633ff',
+ '#6600cc',
+ '#333399',
+ '#330099',
  // violets
- '#ffccff', '#ff99ff', '#cc66cc', '#cc33cc', '#993399', '#663366', '#330033',
+ '#ffccff',
+ '#ff99ff',
+ '#cc66cc',
+ '#cc33cc',
+ '#993399',
+ '#663366',
+ '#330033',
 ];
 
 /**

diff --git a/core/inject.js b/core/inject.js
@@ -343,19 +343,22 @@ const loadSounds = function(pathToMedia, workspace) {
  const audioMgr = workspace.getAudioManager();
  audioMgr.load(
  [
- pathToMedia + 'click.mp3', pathToMedia + 'click.wav',
+ pathToMedia + 'click.mp3',
+ pathToMedia + 'click.wav',
  pathToMedia + 'click.ogg',
  ],
  'click');
  audioMgr.load(
  [
- pathToMedia + 'disconnect.wav', pathToMedia + 'disconnect.mp3',
+ pathToMedia + 'disconnect.wav',
+ pathToMedia + 'disconnect.mp3',
  pathToMedia + 'disconnect.ogg',
  ],
  'disconnect');
  audioMgr.load(
  [
- pathToMedia + 'delete.mp3', pathToMedia + 'delete.ogg',
+ pathToMedia + 'delete.mp3',
+ pathToMedia + 'delete.ogg',
  pathToMedia + 'delete.wav',
  ],
  'delete');

diff --git a/core/options.js b/core/options.js
@@ -94,7 +94,7 @@ const Options = function(options) {
  toolboxAtStart ? toolbox.Position.TOP : toolbox.Position.BOTTOM;
  } else {
  toolboxPosition = (toolboxAtStart === rtl) ? toolbox.Position.RIGHT :
- toolbox.Position.LEFT;
+  toolbox.Position.LEFT;
  }
 
  let hasCss = options['css'];

diff --git a/core/procedures.js b/core/procedures.js
@@ -328,7 +328,8 @@ exports.mutatorOpenListener = mutatorOpenListener;
  * @param {!Abstract} e The event that triggered this listener.
  */
 const mutatorChangeListener = function(e) {
- if (e.type !== eventUtils.BLOCK_CREATE && e.type !== eventUtils.BLOCK_DELETE &&
+ if (e.type !== eventUtils.BLOCK_CREATE &&
+ e.type !== eventUtils.BLOCK_DELETE &&
  e.type !== eventUtils.BLOCK_CHANGE) {
  return;
  }

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
@@ -72,7 +72,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled;
  * to register.
  * @throws {Error} if a renderer with the same name has already been registered.
  */
- const register = function(name, rendererClass) {
+const register = function(name, rendererClass) {
  registry.register(registry.Type.RENDERER, name, rendererClass);
 };
 exports.register = register;

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
@@ -784,7 +784,8 @@ ConstantProvider.prototype.makeJaggedTeeth = function() {
  const width = this.JAGGED_TEETH_WIDTH;
 
  const mainPath = svgPaths.line([
- svgPaths.point(width, height / 4), svgPaths.point(-width * 2, height / 2),
+ svgPaths.point(width, height / 4),
+ svgPaths.point(-width * 2, height / 2),
  svgPaths.point(width, height / 4),
  ]);
  return {height: height, width: width, path: mainPath};
@@ -800,7 +801,8 @@ ConstantProvider.prototype.makeStartHat = function() {
  const width = this.START_HAT_WIDTH;
 
  const mainPath = svgPaths.curve('c', [
- svgPaths.point(30, -height), svgPaths.point(70, -height),
+ svgPaths.point(30, -height),
+ svgPaths.point(70, -height),
  svgPaths.point(width, 0),
  ]);
  return {height: height, width: width, path: mainPath};
@@ -837,7 +839,8 @@ ConstantProvider.prototype.makePuzzleTab = function() {
  'c',
  [
  svgPaths.point(0, forward * control1Y),
- svgPaths.point(-width, back * control2Y), endPoint1,
+ svgPaths.point(-width, back * control2Y),
+ endPoint1,
  ]) +
  svgPaths.curve(
  's', [svgPaths.point(width, back * control3Y), endPoint2]);

diff --git a/core/renderers/common/debug.js b/core/renderers/common/debug.js
@@ -2,7 +2,7 @@
  * @license
  * Copyright 2021 Google LLC
  * SPDX-License-Identifier: Apache-2.0
-*/
+ */
 
 /**
  * @fileoverview Block rendering debugging functionality.

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
@@ -147,8 +147,7 @@ MarkerSvg.prototype.isCursor = function() {
  * @package
  */
 MarkerSvg.prototype.createDom = function() {
- const className =
- this.isCursor() ? CURSOR_CLASS : MARKER_CLASS;
+ const className = this.isCursor() ? CURSOR_CLASS : MARKER_CLASS;
 
  this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': className}, null);
 

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
@@ -64,8 +64,7 @@ ConstantProvider.prototype.getCSS_ = function(selector) {
  // Insertion marker.
  selector + ' .blocklyInsertionMarker>.blocklyPathLight,',
  selector + ' .blocklyInsertionMarker>.blocklyPathDark {',
- 'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
- 'stroke: none;',
+ 'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';', 'stroke: none;',
  '}',
  /* eslint-enable indent */
  ]);

diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js
@@ -215,7 +215,8 @@ HighlightConstantProvider.prototype.makePuzzleTab = function() {
  svgPaths.curve(
  'q',
  [
- svgPaths.point(-width * 0.05, 10), svgPaths.point(width * 0.3, 9.5),
+ svgPaths.point(-width * 0.05, 10),
+ svgPaths.point(width * 0.3, 9.5),
  ]) +
  svgPaths.moveBy(width * 0.67, -1.9) +
  svgPaths.lineOnAxis('v', verticalOverlap);
@@ -272,12 +273,14 @@ HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
 HighlightConstantProvider.prototype.makeStartHat = function() {
  const hatHeight = this.constantProvider.START_HAT.height;
  const pathRtl = svgPaths.moveBy(25, -8.7) + svgPaths.curve('c', [
- svgPaths.point(29.7, -6.2), svgPaths.point(57.2, -0.5),
+ svgPaths.point(29.7, -6.2),
+ svgPaths.point(57.2, -0.5),
  svgPaths.point(75, 8.7),
  ]);
 
  const pathLtr = svgPaths.curve('c', [
- svgPaths.point(17.8, -9.2), svgPaths.point(45.3, -14.9),
+ svgPaths.point(17.8, -9.2),
+ svgPaths.point(45.3, -14.9),
  svgPaths.point(75, -8.7),
  ]) + svgPaths.moveTo(100.5, hatHeight + 0.5);
  return {

diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
@@ -59,7 +59,8 @@ InputRow.prototype.measure = function() {
  if (Types.isInput(elem)) {
  if (Types.isStatementInput(elem)) {
  connectedBlockWidths += elem.connectedBlockWidth;
- } else if (Types.isExternalInput(elem) && elem.connectedBlockWidth !== 0) {
+ } else if (
+ Types.isExternalInput(elem) && elem.connectedBlockWidth !== 0) {
  connectedBlockWidths +=
  (elem.connectedBlockWidth - elem.connectionWidth);
  }

diff --git a/core/renderers/measurables/round_corner.js b/core/renderers/measurables/round_corner.js
@@ -38,7 +38,7 @@ const RoundCorner = function(constants, opt_position) {
  RoundCorner.superClass_.constructor.call(this, constants);
  this.type =
  ((!opt_position || opt_position === 'left') ? Types.LEFT_ROUND_CORNER :
- Types.RIGHT_ROUND_CORNER) |
+  Types.RIGHT_ROUND_CORNER) |
  Types.CORNER;
  this.width = this.constants_.CORNER_RADIUS;
  // The rounded corner extends into the next row by 4 so we only take the

diff --git a/core/renderers/measurables/square_corner.js b/core/renderers/measurables/square_corner.js
@@ -38,7 +38,7 @@ const SquareCorner = function(constants, opt_position) {
  SquareCorner.superClass_.constructor.call(this, constants);
  this.type =
  ((!opt_position || opt_position === 'left') ? Types.LEFT_SQUARE_CORNER :
- Types.RIGHT_SQUARE_CORNER) |
+  Types.RIGHT_SQUARE_CORNER) |
  Types.CORNER;
  this.height = this.constants_.NO_PADDING;
  this.width = this.constants_.NO_PADDING;

diff --git a/core/renderers/measurables/types.js b/core/renderers/measurables/types.js
@@ -52,7 +52,7 @@ const Types = {
  ROW: 1 << 20, // Row.
  TOP_ROW: 1 << 21, // Top Row.
  BOTTOM_ROW: 1 << 22, // Bottom Row.
- INPUT_ROW: 1 << 23,  // Input Row.
+ INPUT_ROW: 1 << 23, // Input Row.
 };
 
 /**