Cleanup for in functionality #2423
Merged
Conversation
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
tests/mocha/astnode_test.js
Outdated
| var inNode = node.in(); | ||
| assertEquals(inNode, null); | ||
| }); | ||
| test('fromInputToNext', function() { |
There was a problem hiding this comment.
Is this actually fromInputToPrevious? It looks like it's going from a statement input to the previous connection on the first block in the substack.
There was a problem hiding this comment.
Yeah it should be fromInputToPrevious. Just changed the name
NeilFraser
reviewed
May 1, 2019
core/ast_node.js
Outdated
| @@ -474,6 +471,31 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) { | |||
| } | |||
| }; | |||
|
|
|||
| /** | |||
| * Find the first editable field or input with a connection on a given block. | |||
| * @param {Blockly.BlockSvg} block The source block of the current location. | |||
There was a problem hiding this comment.
block can't be null (block.inputList would fail), so this should be {!Blockly.BlockSvg}
NeilFraser
reviewed
May 1, 2019
core/ast_node.js
Outdated
| Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) { | ||
| var inputs = block.inputList; | ||
| for (var i = 0; i < inputs.length; i++) { | ||
| var input = inputs[i]; |
There was a problem hiding this comment.
Generally we use this form:
for (var i = 0, input; input = inputs[i]; i++) {
Here and in the j loop below.
NeilFraser
reviewed
May 1, 2019
| @@ -250,7 +250,7 @@ Blockly.ASTNode.prototype.findNextEditableField_ = function(location, | |||
| var fieldRow = parentInput.fieldRow; | |||
| var fieldIdx = fieldRow.indexOf(location); | |||
| var startIdx = opt_first ? 0 : fieldIdx + 1; | |||
| for (var i = startIdx; i < fieldRow.length; i++) { | |||
| for (var i = startIdx, field; field = fieldRow[i]; i++) { | |||
| var field = fieldRow[i]; | |||
There was a problem hiding this comment.
This line is redundant. :)
There was a problem hiding this comment.
Shoot missed that. Will fix in my next PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The basics
The details
Resolves
Proposed Changes
Fixes:
Reason for Changes
Test Coverage
Adds tests in mocha
Tested on:
Additional Information