From 23caa12571ea585b008836c5dad97306a700b825 Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Thu, 12 Sep 2019 18:02:59 -0700 Subject: [PATCH] =?UTF-8?q?Error=20is=20a=20constructor,=20=E2=80=98new?= =?UTF-8?q?=E2=80=99=20is=20not=20required.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/components/component.js | 14 +++++++------- core/components/tree/basenode.js | 2 +- core/field.js | 2 +- core/renderers/common/constants.js | 2 +- core/renderers/zelos/constants.js | 2 +- demos/blockfactory/block_definition_extractor.js | 2 +- demos/blockfactory/factory_utils.js | 6 +++--- .../workspacefactory/wfactory_controller.js | 4 ++-- .../workspacefactory/wfactory_generator.js | 2 +- .../workspacefactory/wfactory_model.js | 2 +- .../blockfactory/workspacefactory/wfactory_view.js | 2 +- tests/mocha/test_helpers.js | 7 +++---- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/core/components/component.js b/core/components/component.js index 6661187b2..3f893623e 100644 --- a/core/components/component.js +++ b/core/components/component.js @@ -234,14 +234,14 @@ Blockly.Component.prototype.setElementInternal = function(element) { Blockly.Component.prototype.setParent = function(parent) { if (this == parent) { // Attempting to add a child to itself is an error. - throw new Error(Blockly.Component.Error.PARENT_UNABLE_TO_BE_SET); + throw Error(Blockly.Component.Error.PARENT_UNABLE_TO_BE_SET); } if (parent && this.parent_ && this.id_ && this.parent_.getChild(this.id_) && this.parent_ != parent) { // This component is already the child of some parent, so it should be // removed using removeChild/removeChildAt first. - throw new Error(Blockly.Component.Error.PARENT_UNABLE_TO_BE_SET); + throw Error(Blockly.Component.Error.PARENT_UNABLE_TO_BE_SET); } this.parent_ = parent; @@ -328,7 +328,7 @@ Blockly.Component.prototype.renderBefore = function(sibling) { Blockly.Component.prototype.render_ = function( opt_parentElement, opt_beforeNode) { if (this.inDocument_) { - throw new Error(Blockly.Component.Error.ALREADY_RENDERED); + throw Error(Blockly.Component.Error.ALREADY_RENDERED); } if (!this.element_) { @@ -526,12 +526,12 @@ Blockly.Component.prototype.addChildAt = function(child, index, opt_render) { if (child.inDocument_ && (opt_render || !this.inDocument_)) { // Adding a child that's already in the document is an error, except if the // parent is also in the document and opt_render is false (e.g. decorate()). - throw new Error(Blockly.Component.Error.ALREADY_RENDERED); + throw Error(Blockly.Component.Error.ALREADY_RENDERED); } if (index < 0 || index > this.getChildCount()) { // Allowing sparse child arrays would lead to strange behavior, so we don't. - throw new Error(Blockly.Component.Error.CHILD_INDEX_OUT_OF_BOUNDS); + throw Error(Blockly.Component.Error.CHILD_INDEX_OUT_OF_BOUNDS); } // Create the index and the child array on first use. @@ -626,7 +626,7 @@ Blockly.Component.prototype.isRightToLeft = function() { */ Blockly.Component.prototype.setRightToLeft = function(rightToLeft) { if (this.inDocument_) { - throw new Error(Blockly.Component.Error.ALREADY_RENDERED); + throw Error(Blockly.Component.Error.ALREADY_RENDERED); } this.rightToLeft_ = rightToLeft; }; @@ -771,7 +771,7 @@ Blockly.Component.prototype.removeChild = function(child, opt_unrender) { } if (!child) { - throw new Error(Blockly.Component.Error.NOT_OUR_CHILD); + throw Error(Blockly.Component.Error.NOT_OUR_CHILD); } return /** @type {!Blockly.Component} */ (child); diff --git a/core/components/tree/basenode.js b/core/components/tree/basenode.js index 5e3299d16..57975c693 100644 --- a/core/components/tree/basenode.js +++ b/core/components/tree/basenode.js @@ -786,7 +786,7 @@ Blockly.tree.BaseNode.prototype.getIconDom = function() { * @protected */ Blockly.tree.BaseNode.prototype.getCalculatedIconClass = function() { - throw new Error('unimplemented abstract method'); + throw Error('unimplemented abstract method'); }; /** diff --git a/core/field.js b/core/field.js index 6739e435e..e78d9d10e 100644 --- a/core/field.js +++ b/core/field.js @@ -668,7 +668,7 @@ Blockly.Field.prototype.getText = function() { * @deprecated 2019 setText should not be used directly. Use setValue instead. */ Blockly.Field.prototype.setText = function(_newText) { - throw new Error('setText method is deprecated'); + throw Error('setText method is deprecated'); }; /** diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js index c7039b632..f2dad7b80 100644 --- a/core/renderers/common/constants.js +++ b/core/renderers/common/constants.js @@ -373,6 +373,6 @@ Blockly.blockRendering.ConstantProvider.prototype.shapeFor = function( case Blockly.NEXT_STATEMENT: return this.NOTCH; default: - throw new Error('Unknown connection type'); + throw Error('Unknown connection type'); } }; diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js index 7f77250e5..d9d34efcd 100644 --- a/core/renderers/zelos/constants.js +++ b/core/renderers/zelos/constants.js @@ -165,7 +165,7 @@ Blockly.zelos.ConstantProvider.prototype.shapeFor = function( case Blockly.NEXT_STATEMENT: return this.NOTCH; default: - throw new Error('Unknown type'); + throw Error('Unknown type'); } }; diff --git a/demos/blockfactory/block_definition_extractor.js b/demos/blockfactory/block_definition_extractor.js index 05ab81d70..899e9b4d3 100644 --- a/demos/blockfactory/block_definition_extractor.js +++ b/demos/blockfactory/block_definition_extractor.js @@ -476,7 +476,7 @@ BlockDefinitionExtractor.buildFieldDropdown_ = function(dropdown) { } else if (Array.isArray(menuGenerator)) { var options = menuGenerator; } else { - throw new Error('Unrecognized type of menuGenerator: ' + menuGenerator); + throw Error('Unrecognized type of menuGenerator: ' + menuGenerator); } var fieldDropdown = BlockDefinitionExtractor.newDomElement_( diff --git a/demos/blockfactory/factory_utils.js b/demos/blockfactory/factory_utils.js index bfcd66b00..f222edf56 100644 --- a/demos/blockfactory/factory_utils.js +++ b/demos/blockfactory/factory_utils.js @@ -767,7 +767,7 @@ FactoryUtils.getBlockTypeFromJsDefinition = function(blockDef) { if (indexOfStartBracket != -1 && indexOfEndBracket != -1) { return blockDef.substring(indexOfStartBracket + 2, indexOfEndBracket); } else { - throw new Error ('Could not parse block type out of JavaScript block ' + + throw Error('Could not parse block type out of JavaScript block ' + 'definition. Brackets normally enclosing block type not found.'); } }; @@ -921,7 +921,7 @@ FactoryUtils.sameBlockXml = function(blockXml1, blockXml2) { // Each XML element should contain a single child element with a 'block' tag if (blockXml1.tagName.toLowerCase() != 'xml' || blockXml2.tagName.toLowerCase() != 'xml') { - throw new Error('Expected two XML elements, received elements with tag ' + + throw Error('Expected two XML elements, received elements with tag ' + 'names: ' + blockXml1.tagName + ' and ' + blockXml2.tagName + '.'); } @@ -931,7 +931,7 @@ FactoryUtils.sameBlockXml = function(blockXml1, blockXml2) { var blockElement2 = blockXml2.getElementsByTagName('block')[0]; if (!(blockElement1 && blockElement2)) { - throw new Error('Could not get find block element in XML.'); + throw Error('Could not get find block element in XML.'); } var cleanBlockXml1 = FactoryUtils.cleanXml(blockElement1); diff --git a/demos/blockfactory/workspacefactory/wfactory_controller.js b/demos/blockfactory/workspacefactory/wfactory_controller.js index 9f53cf1e3..bdfab3bed 100644 --- a/demos/blockfactory/workspacefactory/wfactory_controller.js +++ b/demos/blockfactory/workspacefactory/wfactory_controller.js @@ -340,7 +340,7 @@ WorkspaceFactoryController.prototype.exportXmlFile = function(exportMode) { // Unknown mode. Throw error. var msg = 'Unknown export mode: ' + exportMode; BlocklyDevTools.Analytics.onError(msg); - throw new Error(msg); + throw Error(msg); } // Unpack self-closing tags. These tags fail when embedded in HTML. @@ -760,7 +760,7 @@ WorkspaceFactoryController.prototype.importFile = function(file, importMode) { BlocklyDevTools.Analytics.onImport('WorkspaceContents.xml'); } else { // Throw error if invalid mode. - throw new Error('Unknown import mode: ' + importMode); + throw Error('Unknown import mode: ' + importMode); } } catch(e) { var msg = 'Cannot load XML from file.'; diff --git a/demos/blockfactory/workspacefactory/wfactory_generator.js b/demos/blockfactory/workspacefactory/wfactory_generator.js index 18578cd01..f2b2ca73c 100644 --- a/demos/blockfactory/workspacefactory/wfactory_generator.js +++ b/demos/blockfactory/workspacefactory/wfactory_generator.js @@ -71,7 +71,7 @@ WorkspaceFactoryGenerator.prototype.generateToolboxXml = function() { // Toolbox has categories. // Assert that selected != null if (!this.model.getSelected()) { - throw new Error('Selected is null when the toolbox is empty.'); + throw Error('Selected is null when the toolbox is empty.'); } var xml = this.model.getSelectedXml(); diff --git a/demos/blockfactory/workspacefactory/wfactory_model.js b/demos/blockfactory/workspacefactory/wfactory_model.js index d7f982d76..700d457ac 100644 --- a/demos/blockfactory/workspacefactory/wfactory_model.js +++ b/demos/blockfactory/workspacefactory/wfactory_model.js @@ -164,7 +164,7 @@ WorkspaceFactoryModel.prototype.moveElementToIndex = function(element, newIndex, // Check that indexes are in bounds. if (newIndex < 0 || newIndex >= this.toolboxList.length || oldIndex < 0 || oldIndex >= this.toolboxList.length) { - throw new Error('Index out of bounds when moving element in the model.'); + throw Error('Index out of bounds when moving element in the model.'); } this.deleteElementFromList(oldIndex); this.toolboxList.splice(newIndex, 0, element); diff --git a/demos/blockfactory/workspacefactory/wfactory_view.js b/demos/blockfactory/workspacefactory/wfactory_view.js index 7a33292a4..ec95ad6ad 100644 --- a/demos/blockfactory/workspacefactory/wfactory_view.js +++ b/demos/blockfactory/workspacefactory/wfactory_view.js @@ -201,7 +201,7 @@ WorkspaceFactoryView.prototype.moveTabToIndex = // Check that indexes are in bounds. if (newIndex < 0 || newIndex >= table.rows.length || oldIndex < 0 || oldIndex >= table.rows.length) { - throw new Error('Index out of bounds when moving tab in the view.'); + throw Error('Index out of bounds when moving tab in the view.'); } if (newIndex < oldIndex) { diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js index 022e7eadd..084967d0b 100644 --- a/tests/mocha/test_helpers.js +++ b/tests/mocha/test_helpers.js @@ -23,7 +23,7 @@ function _nonCommentArg(desiredNonCommentArgIndex, expectedNumberOfNonCommentArg function _validateArguments(expectedNumberOfNonCommentArgs, args) { if (!( args.length == expectedNumberOfNonCommentArgs || (args.length == expectedNumberOfNonCommentArgs + 1 && (typeof(args[0]) == 'string') || args[0] == null))) { - throw new Error('Incorrect arguments passed to assert function'); + throw Error('Incorrect arguments passed to assert function'); } } /** @@ -56,7 +56,7 @@ function assertTrue() { var commentArg = _commentArg(1, arguments); var booleanValue = _nonCommentArg(1, 1, arguments); if (typeof(booleanValue) != 'boolean') { - throw new Error('Bad argument to assertTrue(boolean)'); + throw Error('Bad argument to assertTrue(boolean)'); } chai.assert.isTrue(booleanValue, commentArg); @@ -71,7 +71,7 @@ function assertFalse() { var booleanValue = _nonCommentArg(1, 1, arguments); if (typeof(booleanValue) != 'boolean') { - throw new Error('Bad argument to assertFalse(boolean)'); + throw Error('Bad argument to assertFalse(boolean)'); } chai.assert.isNotTrue(booleanValue, commentArg); @@ -175,4 +175,3 @@ function defineStatementBlock() { "helpUrl": "" }]); } -