chore: update language generators to const and let #5647
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,7 +113,7 @@ Blockly.Lua.init = function(workspace) { | |
| */ | ||
| Blockly.Lua.finish = function(code) { | ||
| // Convert the definitions dictionary into a list. | ||
| const definitions = Blockly.utils.object.values(this.definitions_); | ||
| // Call Blockly.Generator's finish. | ||
| code = Object.getPrototypeOf(this).finish.call(this, code); | ||
| this.isInitialized = false; | ||
|
|
@@ -156,7 +156,7 @@ Blockly.Lua.quote_ = function(string) { | |
| * @protected | ||
| */ | ||
| Blockly.Lua.multiline_quote_ = function(string) { | ||
| const lines = string.split(/\n/g).map(this.quote_); | ||
| // Join with the following, plus a newline: | ||
| // .. '\n' .. | ||
| return lines.join(' .. \'\\n\' ..\n'); | ||
|
|
@@ -173,20 +173,20 @@ Blockly.Lua.multiline_quote_ = function(string) { | |
| * @protected | ||
| */ | ||
| Blockly.Lua.scrub_ = function(block, code, opt_thisOnly) { | ||
| let commentCode = ''; | ||
| // Only collect comments for blocks that aren't inline. | ||
| if (!block.outputConnection || !block.outputConnection.targetConnection) { | ||
| // Collect comment for this block. | ||
| let comment = block.getCommentText(); | ||
| if (comment) { | ||
| comment = Blockly.utils.string.wrap(comment, this.COMMENT_WRAP - 3); | ||
| commentCode += this.prefixLines(comment, '-- ') + '\n'; | ||
| } | ||
| // Collect comments for all value arguments. | ||
| // Don't collect comments for nested statements. | ||
| for (let i = 0; i < block.inputList.length; i++) { | ||
| if (block.inputList[i].type === Blockly.inputTypes.VALUE) { | ||
| const childBlock = block.inputList[i].connection.targetBlock(); | ||
| if (childBlock) { | ||
| comment = this.allNestedComments(childBlock); | ||
| if (comment) { | ||
|
|
@@ -196,7 +196,7 @@ Blockly.Lua.scrub_ = function(block, code, opt_thisOnly) { | |
| } | ||
| } | ||
| } | ||
| const nextBlock = block.nextConnection && block.nextConnection.targetBlock(); | ||
| const nextCode = opt_thisOnly ? '' : this.blockToCode(nextBlock); | ||
| return commentCode + code + nextCode; | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -152,7 +152,7 @@ Blockly.PHP.init = function(workspace) { | |
| */ | ||
| Blockly.PHP.finish = function(code) { | ||
| // Convert the definitions dictionary into a list. | ||
| const definitions = Blockly.utils.object.values(this.definitions_); | ||
| // Call Blockly.Generator's finish. | ||
| code = Object.getPrototypeOf(this).finish.call(this, code); | ||
| this.isInitialized = false; | ||
|
|
@@ -193,7 +193,7 @@ Blockly.PHP.quote_ = function(string) { | |
| * @protected | ||
| */ | ||
| Blockly.PHP.multiline_quote_ = function (string) { | ||
| const lines = string.split(/\n/g).map(this.quote_); | ||
| // Join with the following, plus a newline: | ||
| // . "\n" . | ||
| // Newline escaping only works in double-quoted strings. | ||
|
|
@@ -211,20 +211,20 @@ Blockly.PHP.multiline_quote_ = function (string) { | |
| * @protected | ||
| */ | ||
| Blockly.PHP.scrub_ = function(block, code, opt_thisOnly) { | ||
| let commentCode = ''; | ||
| // Only collect comments for blocks that aren't inline. | ||
| if (!block.outputConnection || !block.outputConnection.targetConnection) { | ||
| // Collect comment for this block. | ||
| let comment = block.getCommentText(); | ||
| if (comment) { | ||
| comment = Blockly.utils.string.wrap(comment, this.COMMENT_WRAP - 3); | ||
| commentCode += this.prefixLines(comment, '// ') + '\n'; | ||
| } | ||
| // Collect comments for all value arguments. | ||
| // Don't collect comments for nested statements. | ||
| for (let i = 0; i < block.inputList.length; i++) { | ||
| if (block.inputList[i].type === Blockly.inputTypes.VALUE) { | ||
| const childBlock = block.inputList[i].connection.targetBlock(); | ||
| if (childBlock) { | ||
| comment = this.allNestedComments(childBlock); | ||
| if (comment) { | ||
|
|
@@ -234,8 +234,8 @@ Blockly.PHP.scrub_ = function(block, code, opt_thisOnly) { | |
| } | ||
| } | ||
| } | ||
| const nextBlock = block.nextConnection && block.nextConnection.targetBlock(); | ||
| const nextCode = opt_thisOnly ? '' : this.blockToCode(nextBlock); | ||
| return commentCode + code + nextCode; | ||
| }; | ||
|
|
||
|
|
@@ -250,25 +250,25 @@ Blockly.PHP.scrub_ = function(block, code, opt_thisOnly) { | |
| */ | ||
| Blockly.PHP.getAdjusted = function(block, atId, opt_delta, opt_negate, | ||
| opt_order) { | ||
| let delta = opt_delta || 0; | ||
| let order = opt_order || this.ORDER_NONE; | ||
| if (block.workspace.options.oneBasedIndex) { | ||
| delta--; | ||
| } | ||
| let defaultAtIndex = block.workspace.options.oneBasedIndex ? '1' : '0'; | ||
| let outerOrder = order; | ||
| let innerOrder; | ||
|
Comment on lines
+259
to
+260
There was a problem hiding this comment. See comments above for Blockly.JavaScript.getAdjusted. |
||
| if (delta > 0) { | ||
| outerOrder = this.ORDER_ADDITION; | ||
| innerOrder = this.ORDER_ADDITION; | ||
| } else if (delta < 0) { | ||
| outerOrder = this.ORDER_SUBTRACTION; | ||
| innerOrder = this.ORDER_SUBTRACTION; | ||
| } else if (opt_negate) { | ||
| outerOrder = this.ORDER_UNARY_NEGATION; | ||
| innerOrder = this.ORDER_UNARY_NEGATION; | ||
| } | ||
| let at = this.valueToCode(block, atId, outerOrder) || defaultAtIndex; | ||
|
|
||
| if (Blockly.isNumber(at)) { | ||
| // If the index is a naked number, adjust it right now. | ||
|
|
@@ -280,18 +280,15 @@ Blockly.PHP.getAdjusted = function(block, atId, opt_delta, opt_negate, | |
| // If the index is dynamic, adjust it in code. | ||
| if (delta > 0) { | ||
| at = at + ' + ' + delta; | ||
| } else if (delta < 0) { | ||
| at = at + ' - ' + -delta; | ||
| } | ||
| if (opt_negate) { | ||
| if (delta) { | ||
| at = '-(' + at + ')'; | ||
| } else { | ||
| at = '-' + at; | ||
| } | ||
| } | ||
| innerOrder = Math.floor(innerOrder); | ||
| order = Math.floor(order); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've read through this function about a hundred times and I've got some thoughts:
innerOrderandouterOrderare needed.delta === 0 && !opt_negate—which is probably going to be the most common case, but in that caseinnerOrder === undefineduntil it gets converted toNaNbyMath.flooron line 311.if (innerOrder && order >= innerOrder)could (I think!) have more readably have been writtenif((delta !== 0 || opt_negate) && order >= outerOrder)deltaoropt_negate,atwill never get parenthesised on lined 314.atis a number theninnerOrderwill remainundefinedeven ifdelta !== 0oropt_negate(not true in the refactored code!)—but the result is the same in both original and refactor since in that case we skip over all the code that accessesinnerOrderanyway.Anyway: I think the refactoring is equivalent to the original, but there's no way that I'd pass it (or indeed the original) from a readability point of view.