Skip to content

Commit

Permalink
chore: auto-fix violations of comma-dangle rule (google#5625)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rachel-fenichel
rachel-fenichel authored Oct 21, 2021
1 parent 3851b14 commit e8d6f7f
Show file tree
Hide file tree
Showing 74 changed files with 492 additions and 492 deletions.
30 changes: 15 additions & 15 deletions blocks/colour.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "field_colour",
"name": "COLOUR",
"colour": "#ff0000"
}
"colour": "#ff0000",
},
],
"output": "Colour",
"helpUrl": "%{BKY_COLOUR_PICKER_HELPURL}",
"style": "colour_blocks",
"tooltip": "%{BKY_COLOUR_PICKER_TOOLTIP}",
"extensions": ["parent_tooltip_when_inline"]
"extensions": ["parent_tooltip_when_inline"],
},

// Block for random colour.
Expand All @@ -54,7 +54,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
"output": "Colour",
"helpUrl": "%{BKY_COLOUR_RANDOM_HELPURL}",
"style": "colour_blocks",
"tooltip": "%{BKY_COLOUR_RANDOM_TOOLTIP}"
"tooltip": "%{BKY_COLOUR_RANDOM_TOOLTIP}",
},

// Block for composing a colour from RGB components.
Expand All @@ -66,25 +66,25 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
"type": "input_value",
"name": "RED",
"check": "Number",
"align": "RIGHT"
"align": "RIGHT",
},
{
"type": "input_value",
"name": "GREEN",
"check": "Number",
"align": "RIGHT"
"align": "RIGHT",
},
{
"type": "input_value",
"name": "BLUE",
"check": "Number",
"align": "RIGHT"
}
"align": "RIGHT",
},
],
"output": "Colour",
"helpUrl": "%{BKY_COLOUR_RGB_HELPURL}",
"style": "colour_blocks",
"tooltip": "%{BKY_COLOUR_RGB_TOOLTIP}"
"tooltip": "%{BKY_COLOUR_RGB_TOOLTIP}",
},

// Block for blending two colours together.
Expand All @@ -97,24 +97,24 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
"type": "input_value",
"name": "COLOUR1",
"check": "Colour",
"align": "RIGHT"
"align": "RIGHT",
},
{
"type": "input_value",
"name": "COLOUR2",
"check": "Colour",
"align": "RIGHT"
"align": "RIGHT",
},
{
"type": "input_value",
"name": "RATIO",
"check": "Number",
"align": "RIGHT"
}
"align": "RIGHT",
},
],
"output": "Colour",
"helpUrl": "%{BKY_COLOUR_BLEND_HELPURL}",
"style": "colour_blocks",
"tooltip": "%{BKY_COLOUR_BLEND_TOOLTIP}"
}
"tooltip": "%{BKY_COLOUR_BLEND_TOOLTIP}",
},
]); // END JSON EXTRACT (Do not delete this comment.)
76 changes: 38 additions & 38 deletions blocks/lists.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
"output": "Array",
"style": "list_blocks",
"tooltip": "%{BKY_LISTS_CREATE_EMPTY_TOOLTIP}",
"helpUrl": "%{BKY_LISTS_CREATE_EMPTY_HELPURL}"
"helpUrl": "%{BKY_LISTS_CREATE_EMPTY_HELPURL}",
},
// Block for creating a list with one element repeated.
{
Expand All @@ -49,18 +49,18 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
"args0": [
{
"type": "input_value",
"name": "ITEM"
"name": "ITEM",
},
{
"type": "input_value",
"name": "NUM",
"check": "Number"
}
"check": "Number",
},
],
"output": "Array",
"style": "list_blocks",
"tooltip": "%{BKY_LISTS_REPEAT_TOOLTIP}",
"helpUrl": "%{BKY_LISTS_REPEAT_HELPURL}"
"helpUrl": "%{BKY_LISTS_REPEAT_HELPURL}",
},
// Block for reversing a list.
{
Expand All @@ -70,14 +70,14 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "LIST",
"check": "Array"
}
"check": "Array",
},
],
"output": "Array",
"inputsInline": true,
"style": "list_blocks",
"tooltip": "%{BKY_LISTS_REVERSE_TOOLTIP}",
"helpUrl": "%{BKY_LISTS_REVERSE_HELPURL}"
"helpUrl": "%{BKY_LISTS_REVERSE_HELPURL}",
},
// Block for checking if a list is empty
{
Expand All @@ -87,13 +87,13 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "VALUE",
"check": ["String", "Array"]
}
"check": ["String", "Array"],
},
],
"output": "Boolean",
"style": "list_blocks",
"tooltip": "%{BKY_LISTS_ISEMPTY_TOOLTIP}",
"helpUrl": "%{BKY_LISTS_ISEMPTY_HELPURL}"
"helpUrl": "%{BKY_LISTS_ISEMPTY_HELPURL}",
},
// Block for getting the list length
{
Expand All @@ -103,14 +103,14 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
{
"type": "input_value",
"name": "VALUE",
"check": ["String", "Array"]
}
"check": ["String", "Array"],
},
],
"output": "Number",
"style": "list_blocks",
"tooltip": "%{BKY_LISTS_LENGTH_TOOLTIP}",
"helpUrl": "%{BKY_LISTS_LENGTH_HELPURL}"
}
"helpUrl": "%{BKY_LISTS_LENGTH_HELPURL}",
},
]); // END JSON EXTRACT (Do not delete this comment.)

Blockly.Blocks['lists_create_with'] = {
Expand Down Expand Up @@ -254,7 +254,7 @@ Blockly.Blocks['lists_create_with'] = {
this.removeInput('ADD' + i);
i++;
}
}
},
};

Blockly.Blocks['lists_create_with_container'] = {
Expand All @@ -269,7 +269,7 @@ Blockly.Blocks['lists_create_with_container'] = {
this.appendStatementInput('STACK');
this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_CONTAINER_TOOLTIP']);
this.contextMenu = false;
}
},
};

Blockly.Blocks['lists_create_with_item'] = {
Expand All @@ -285,7 +285,7 @@ Blockly.Blocks['lists_create_with_item'] = {
this.setNextStatement(true);
this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_ITEM_TOOLTIP']);
this.contextMenu = false;
}
},
};

Blockly.Blocks['lists_indexOf'] = {
Expand All @@ -297,7 +297,7 @@ Blockly.Blocks['lists_indexOf'] = {
var OPERATORS =
[
[Blockly.Msg['LISTS_INDEX_OF_FIRST'], 'FIRST'],
[Blockly.Msg['LISTS_INDEX_OF_LAST'], 'LAST']
[Blockly.Msg['LISTS_INDEX_OF_LAST'], 'LAST'],
];
this.setHelpUrl(Blockly.Msg['LISTS_INDEX_OF_HELPURL']);
this.setStyle('list_blocks');
Expand All @@ -314,7 +314,7 @@ Blockly.Blocks['lists_indexOf'] = {
return Blockly.Msg['LISTS_INDEX_OF_TOOLTIP'].replace('%1',
thisBlock.workspace.options.oneBasedIndex ? '0' : '-1');
});
}
},
};

Blockly.Blocks['lists_getIndex'] = {
Expand All @@ -327,15 +327,15 @@ Blockly.Blocks['lists_getIndex'] = {
[
[Blockly.Msg['LISTS_GET_INDEX_GET'], 'GET'],
[Blockly.Msg['LISTS_GET_INDEX_GET_REMOVE'], 'GET_REMOVE'],
[Blockly.Msg['LISTS_GET_INDEX_REMOVE'], 'REMOVE']
[Blockly.Msg['LISTS_GET_INDEX_REMOVE'], 'REMOVE'],
];
this.WHERE_OPTIONS =
[
[Blockly.Msg['LISTS_GET_INDEX_FROM_START'], 'FROM_START'],
[Blockly.Msg['LISTS_GET_INDEX_FROM_END'], 'FROM_END'],
[Blockly.Msg['LISTS_GET_INDEX_FIRST'], 'FIRST'],
[Blockly.Msg['LISTS_GET_INDEX_LAST'], 'LAST'],
[Blockly.Msg['LISTS_GET_INDEX_RANDOM'], 'RANDOM']
[Blockly.Msg['LISTS_GET_INDEX_RANDOM'], 'RANDOM'],
];
this.setHelpUrl(Blockly.Msg['LISTS_GET_INDEX_HELPURL']);
this.setStyle('list_blocks');
Expand Down Expand Up @@ -505,7 +505,7 @@ Blockly.Blocks['lists_getIndex'] = {
if (Blockly.Msg['LISTS_GET_INDEX_TAIL']) {
this.moveInputBefore('TAIL', null);
}
}
},
};

Blockly.Blocks['lists_setIndex'] = {
Expand All @@ -517,15 +517,15 @@ Blockly.Blocks['lists_setIndex'] = {
var MODE =
[
[Blockly.Msg['LISTS_SET_INDEX_SET'], 'SET'],
[Blockly.Msg['LISTS_SET_INDEX_INSERT'], 'INSERT']
[Blockly.Msg['LISTS_SET_INDEX_INSERT'], 'INSERT'],
];
this.WHERE_OPTIONS =
[
[Blockly.Msg['LISTS_GET_INDEX_FROM_START'], 'FROM_START'],
[Blockly.Msg['LISTS_GET_INDEX_FROM_END'], 'FROM_END'],
[Blockly.Msg['LISTS_GET_INDEX_FIRST'], 'FIRST'],
[Blockly.Msg['LISTS_GET_INDEX_LAST'], 'LAST'],
[Blockly.Msg['LISTS_GET_INDEX_RANDOM'], 'RANDOM']
[Blockly.Msg['LISTS_GET_INDEX_RANDOM'], 'RANDOM'],
];
this.setHelpUrl(Blockly.Msg['LISTS_SET_INDEX_HELPURL']);
this.setStyle('list_blocks');
Expand Down Expand Up @@ -651,7 +651,7 @@ Blockly.Blocks['lists_setIndex'] = {
}

this.getInput('AT').appendField(menu, 'WHERE');
}
},
};

Blockly.Blocks['lists_getSublist'] = {
Expand All @@ -664,13 +664,13 @@ Blockly.Blocks['lists_getSublist'] = {
[
[Blockly.Msg['LISTS_GET_SUBLIST_START_FROM_START'], 'FROM_START'],
[Blockly.Msg['LISTS_GET_SUBLIST_START_FROM_END'], 'FROM_END'],
[Blockly.Msg['LISTS_GET_SUBLIST_START_FIRST'], 'FIRST']
[Blockly.Msg['LISTS_GET_SUBLIST_START_FIRST'], 'FIRST'],
];
this['WHERE_OPTIONS_2'] =
[
[Blockly.Msg['LISTS_GET_SUBLIST_END_FROM_START'], 'FROM_START'],
[Blockly.Msg['LISTS_GET_SUBLIST_END_FROM_END'], 'FROM_END'],
[Blockly.Msg['LISTS_GET_SUBLIST_END_LAST'], 'LAST']
[Blockly.Msg['LISTS_GET_SUBLIST_END_LAST'], 'LAST'],
];
this.setHelpUrl(Blockly.Msg['LISTS_GET_SUBLIST_HELPURL']);
this.setStyle('list_blocks');
Expand Down Expand Up @@ -767,7 +767,7 @@ Blockly.Blocks['lists_getSublist'] = {
if (Blockly.Msg['LISTS_GET_SUBLIST_TAIL']) {
this.moveInputBefore('TAIL', null);
}
}
},
};

Blockly.Blocks['lists_sort'] = {
Expand All @@ -785,29 +785,29 @@ Blockly.Blocks['lists_sort'] = {
"options": [
[Blockly.Msg['LISTS_SORT_TYPE_NUMERIC'], "NUMERIC"],
[Blockly.Msg['LISTS_SORT_TYPE_TEXT'], "TEXT"],
[Blockly.Msg['LISTS_SORT_TYPE_IGNORECASE'], "IGNORE_CASE"]
]
[Blockly.Msg['LISTS_SORT_TYPE_IGNORECASE'], "IGNORE_CASE"],
],
},
{
"type": "field_dropdown",
"name": "DIRECTION",
"options": [
[Blockly.Msg['LISTS_SORT_ORDER_ASCENDING'], "1"],
[Blockly.Msg['LISTS_SORT_ORDER_DESCENDING'], "-1"]
]
[Blockly.Msg['LISTS_SORT_ORDER_DESCENDING'], "-1"],
],
},
{
"type": "input_value",
"name": "LIST",
"check": "Array"
}
"check": "Array",
},
],
"output": "Array",
"style": "list_blocks",
"tooltip": Blockly.Msg['LISTS_SORT_TOOLTIP'],
"helpUrl": Blockly.Msg['LISTS_SORT_HELPURL']
"helpUrl": Blockly.Msg['LISTS_SORT_HELPURL'],
});
}
},
};

Blockly.Blocks['lists_split'] = {
Expand All @@ -821,7 +821,7 @@ Blockly.Blocks['lists_split'] = {
var dropdown = new Blockly.FieldDropdown(
[
[Blockly.Msg['LISTS_SPLIT_LIST_FROM_TEXT'], 'SPLIT'],
[Blockly.Msg['LISTS_SPLIT_TEXT_FROM_LIST'], 'JOIN']
[Blockly.Msg['LISTS_SPLIT_TEXT_FROM_LIST'], 'JOIN'],
],
function(newMode) {
thisBlock.updateType_(newMode);
Expand Down
Loading

0 comments on commit e8d6f7f

Please sign in to comment.