Merge branch 'rc/v12.0.0' into develop-v12-merge

This commit is contained in:
Aaron Dodson
2025-03-11 09:42:25 -07:00
committed by GitHub
148 changed files with 3869 additions and 3295 deletions

View File

@@ -25,7 +25,7 @@ export function procedures_defreturn(block: Block, generator: PhpGenerator) {
const workspace = block.workspace;
const usedVariables = Variables.allUsedVarModels(workspace) || [];
for (const variable of usedVariables) {
const varName = variable.name;
const varName = variable.getName();
// getVars returns parameter names, not ids, for procedure blocks
if (!block.getVars().includes(varName)) {
globals.push(generator.getVariableName(varName));

View File

@@ -25,7 +25,7 @@ export function procedures_defreturn(block: Block, generator: PythonGenerator) {
const workspace = block.workspace;
const usedVariables = Variables.allUsedVarModels(workspace) || [];
for (const variable of usedVariables) {
const varName = variable.name;
const varName = variable.getName();
// getVars returns parameter names, not ids, for procedure blocks
if (!block.getVars().includes(varName)) {
globals.push(generator.getVariableName(varName));