Skip to content

remove ancient patch floating blocks code #11281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riknoll merged 2 commits into from
Apr 23, 2026
Merged

remove ancient patch floating blocks code #11281

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5048c5f
add disabled reasons to import check
riknoll Apr 21, 2026
be704af
remove patch floating blocks
riknoll Apr 21, 2026
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
57 changes: 0 additions & 57 deletions pxtblocks/importer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,60 +202,6 @@ export function loadWorkspaceXml(xml: string, skipReport = false, opts?: DomToWo
}
}

function patchFloatingBlocks(dom: Element, info: pxtc.BlocksInfo) {
const onstarts = getBlocksWithType(dom, ts.pxtc.ON_START_TYPE);
let onstart = onstarts.length ? onstarts[0] : undefined;
if (onstart) { // nothing to do
onstart.removeAttribute("deletable");
return;
}

let newnodes: Element[] = [];

const blocks: pxt.Map<pxtc.SymbolInfo> = info.blocksById;

// walk top level blocks
let node = dom.firstElementChild;
let insertNode: Element = undefined;
while (node) {
const nextNode = node.nextElementSibling;
// does this block is disable or have s nested statement block?
const nodeType = node.getAttribute("type");
if (!node.getAttribute("disabled") && !node.getElementsByTagName("statement").length
&& (buildinBlockStatements[nodeType] ||
(blocks[nodeType] && blocks[nodeType].retType == "void" && !hasArrowFunction(blocks[nodeType])))
) {
// old block, needs to be wrapped in onstart
if (!insertNode) {
insertNode = dom.ownerDocument.createElement("statement");
insertNode.setAttribute("name", "HANDLER");
if (!onstart) {
onstart = dom.ownerDocument.createElement("block");
onstart.setAttribute("type", ts.pxtc.ON_START_TYPE);
newnodes.push(onstart);
}
onstart.appendChild(insertNode);
insertNode.appendChild(node);

node.removeAttribute("x");
node.removeAttribute("y");
insertNode = node;
} else {
// event, add nested statement
const next = dom.ownerDocument.createElement("next");
next.appendChild(node);
insertNode.appendChild(next);
node.removeAttribute("x");
node.removeAttribute("y");
insertNode = node;
}
}
node = nextNode;
}

newnodes.forEach(n => dom.appendChild(n));
}

/**
* Patch to transform old function blocks to new ones, and rename child nodes
*/
Expand Down Expand Up @@ -347,9 +293,6 @@ export function importXml(pkgTargetVersion: string, xml: string, info: pxtc.Bloc
for (let i = 0; i < blocks.length; ++i)
patchBlock(info, enums, blocks[i]);

// patch floating blocks
patchFloatingBlocks(doc.documentElement, info);

// patch function blocks
patchFunctionBlocks(doc.documentElement, info)

Expand Down
Loading