Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/blocks/grid-picker.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ Detailed behavior and edge cases, mainly for contributors and automated agents.
keys may use either the TypeScript parameter name or its name in the block
definition, and both sets are combined. If both set the same key, the block
definition name wins.
- When an input uses an identity grid picker as its shadow, an enum member and
its `enumIdentity` constant alias both use that picker if the choice matches
its enum sources and tag filter. Other values keep their normal blocks.
- Field options are read as strings, so `fixedInstances` is only on when set to
`true` (or `1`). `fixedInstances=false` leaves it off.
- A receiver (`this`) shown as a grid picker is always a dropdown. Calls on an
Expand Down
37 changes: 37 additions & 0 deletions pxtcompiler/emitter/decompiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2210,6 +2210,12 @@ ${output}</xml>`;
return;
}

const pickerShadow = getEnumGridPickerShadow(e, shadowBlockInfo);
if (pickerShadow) {
addInput(mkValue(U.htmlEscape(param.definitionName), pickerShadow, param.shadowBlockId, shadowMutation));
return;
}

switch (e.kind) {
case SK.FunctionExpression:
case SK.ArrowFunction:
Expand Down Expand Up @@ -2381,6 +2387,37 @@ ${output}</xml>`;
return r;
}

function getEnumGridPickerShadow(value: Expression, shadow: SymbolInfo | undefined): ExpressionNode | undefined {
if (shadow?.attributes.shim !== "TD_ID") return undefined;
const field = fieldBlockInfo(shadow.attributes.blockId);
if (field?.fieldEditor !== "gridpicker") return undefined;

let memberName: string | undefined;
if (value.kind === SK.Identifier) {
memberName = pxtInfo(value).commentAttrs?.enumIdentity;
}
else if (value.kind === SK.PropertyAccessExpression) {
const info = pxtInfo(value).callInfo;
if (info) {
memberName = info.decl?.kind === SK.EnumMember ? info.qName : attrs(info).enumIdentity;
}
}
if (!memberName) return undefined;

const apis = blocksInfo.apis;
const member = apis.byQName[memberName];
if (member?.kind !== SymbolKind.EnumMember || member.attributes.blockHidden) return undefined;
const enums = pxt.blocks.getConfiguredEnumNames(field, apis);
if (enums.length ? enums.indexOf(member.namespace) < 0 : member.namespace !== field.type) return undefined;

// An out-of-filter value keeps its ordinary block, rather than being forced into this picker.
const filter = field.fieldOptions?.filter;
if (typeof filter === "string" && !pxt.sprite.compileTagFilter(filter)(pxt.sprite.getSymbolTags(apis, member))) {
return undefined;
}
return getFieldBlock(U.htmlEscape(shadow.attributes.blockId), U.htmlEscape(field.definitionName), member.qName);
}

function fieldBlockInfo(blockId: string) {
if (blocksInfo.blocksById[blockId]) {
const comp = pxt.blocks.compileInfo(blocksInfo.blocksById[blockId]);
Expand Down
120 changes: 120 additions & 0 deletions tests/decompile-test/baselines/gridPickerShadow.blocks
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<xml xmlns="http://www.w3.org/1999/xhtml">
<block type="pxt-on-start">
<statement name="HANDLER">
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider">
<field name="choice">TestMonster.Zombie</field>
</shadow>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount">
<field name="choice">TestAnimal.Chicken</field>
</shadow>
</value>
<next>
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider">
<field name="choice">TestMonster.Zombie</field>
</shadow>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount">
<field name="choice">TestAnimal.Chicken</field>
</shadow>
</value>
<next>
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider"/>
<block type="test_grid_picker_monster">
<field name="value">TestMonster.Creeper</field>
</block>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount"/>
<block type="test_grid_picker_animal">
<field name="value">TestAnimal.Cow</field>
</block>
</value>
<next>
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider"/>
<block type="test_grid_picker_monster">
<field name="value">TestMonster.Creeper</field>
</block>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount"/>
<block type="test_grid_picker_animal">
<field name="value">TestAnimal.Cow</field>
</block>
</value>
<next>
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider">
<field name="choice">TestMonster.Zombie</field>
</shadow>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount"/>
<block type="test_grid_picker_terrain">
<field name="value">TestTerrain.Grass</field>
</block>
</value>
<next>
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider">
<field name="choice">TestMonster.Zombie</field>
</shadow>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount"/>
<block type="test_grid_picker_terrain">
<field name="value">TestTerrain.Grass</field>
</block>
</value>
<next>
<block type="variables_set">
<field name="VAR">mount</field>
<value name="VALUE">
<shadow type="math_number"><field name="NUM">0</field></shadow>
<block type="test_grid_picker_animal">
<field name="value">TestAnimal.Chicken</field>
</block>
</value>
<next>
<block type="test_grid_picker_jockey">
<value name="rider">
<shadow type="test_grid_picker_rider">
<field name="choice">TestMonster.Zombie</field>
</shadow>
</value>
<value name="mount">
<shadow type="test_grid_picker_mount"/>
<block type="variables_get">
<field name="VAR">mount</field>
</block>
</value>
</block>
</next>
</block>
</next>
</block>
</next>
</block>
</next>
</block>
</next>
</block>
</next>
</block>
</next>
</block>
</statement>
</block>
</xml>
8 changes: 8 additions & 0 deletions tests/decompile-test/cases/gridPickerShadow.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
gridPickerTest.spawnJockey(TEST_ZOMBIE, TEST_CHICKEN)
gridPickerTest.spawnJockey(TestMonster.Zombie, TestAnimal.Chicken)
gridPickerTest.spawnJockey(TEST_CREEPER, TEST_COW)
gridPickerTest.spawnJockey(TestMonster.Creeper, TestAnimal.Cow)
gridPickerTest.spawnJockey(TEST_ZOMBIE, TEST_GRASS)
gridPickerTest.spawnJockey(TEST_ZOMBIE, TestTerrain.Grass)
let mount = TEST_CHICKEN
gridPickerTest.spawnJockey(TEST_ZOMBIE, mount)
63 changes: 63 additions & 0 deletions tests/decompile-test/cases/testBlocks/gridPickerShadow.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
enum TestAnimal {
//% blockIdentity=gridPickerTest.animal tags=mount
Chicken = 10,
//% blockIdentity=gridPickerTest.animal tags="mount excluded"
Cow = 11
}

enum TestMonster {
//% blockIdentity=gridPickerTest.monster tags="mount rider"
Zombie = 32,
//% blockIdentity=gridPickerTest.monster
Creeper = 33
}

enum TestTerrain {
//% blockIdentity=gridPickerTest.terrain tags=mount
Grass = 10
}

//% blockIdentity=gridPickerTest.animal enumIdentity=TestAnimal.Chicken
const TEST_CHICKEN = TestAnimal.Chicken;
//% blockIdentity=gridPickerTest.animal enumIdentity=TestAnimal.Cow
const TEST_COW = TestAnimal.Cow;
//% blockIdentity=gridPickerTest.monster enumIdentity=TestMonster.Zombie
const TEST_ZOMBIE = TestMonster.Zombie;
//% blockIdentity=gridPickerTest.monster enumIdentity=TestMonster.Creeper
const TEST_CREEPER = TestMonster.Creeper;
//% blockIdentity=gridPickerTest.terrain enumIdentity=TestTerrain.Grass
const TEST_GRASS = TestTerrain.Grass;

namespace gridPickerTest {
//% blockId=test_grid_picker_animal block="animal $value" shim=TD_ID
export function animal(value: TestAnimal): number {
return value;
}

//% blockId=test_grid_picker_monster block="monster $value" shim=TD_ID
export function monster(value: TestMonster): number {
return value;
}

//% blockId=test_grid_picker_terrain block="terrain $value" shim=TD_ID
export function terrain(value: TestTerrain): number {
return value;
}

//% blockId=test_grid_picker_rider block="$choice" shim=TD_ID blockHidden=1
//% choice.fieldEditor=gridpicker choice.fieldOptions.enumNames="TestAnimal,TestMonster" choice.fieldOptions.filter=rider
export function rider(choice: number): number {
return choice;
}

//% blockId=test_grid_picker_mount block="$choice" shim=TD_ID blockHidden=1
//% choice.fieldEditor=gridpicker choice.fieldOptions.enumNames="TestAnimal,TestMonster" choice.fieldOptions.filter="mount !excluded"
export function mount(choice: number): number {
return choice;
}

//% blockId=test_grid_picker_jockey block="spawn $rider riding $mount"
//% rider.shadow=test_grid_picker_rider mount.shadow=test_grid_picker_mount
export function spawnJockey(rider: number, mount: number): void {
}
}
1 change: 1 addition & 0 deletions tests/decompile-test/cases/testBlocks/pxt.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"globals.ts",
"spritekind.ts",
"decompilerShadowAlias.ts",
"gridPickerShadow.ts",
"blockAliasFor.ts",
"forceStatement.ts",
"robot.ts"
Expand Down
Loading