global variables

Author: riknoll

pxtblocks/blocksProgram.ts

@@ -62,6 +62,7 @@ export interface BlocksProgram {
     getKindInfo(kindName: string): string[];
     getVariableQualifiedName(varName: string, workspace: Blockly.Workspace): string;
     refreshSymbols?(): void;
+    getVariableSymbol(varId: string): BlocksVariableSymbol;
 }
 
 
@@ -122,6 +123,19 @@ export class SingleWorkspaceBlocksProgram implements BlocksProgram {
     getVariableQualifiedName(varName: string, workspace: Blockly.Workspace): string {
         return varName;
     }
+
+    getVariableSymbol(varId: string): BlocksVariableSymbol {
+        const variable = this.workspace.getVariableMap().getVariableById(varId);
+        if (variable) {
+            return {
+                type: "variable",
+                name: variable.getName(),
+                id: variable.getId(),
+                file: "main.blocks"
+            };
+        }
+        return null;
+    }
 }
 
 
@@ -307,6 +321,17 @@ export class MultiWorkspaceBlocksProgram implements BlocksProgram {
         throw new Error(`Variable ${varName} not found in any workspace`);
     }
 
+    getVariableSymbol(varId: string): BlocksVariableSymbol {
+        for (const symbols of this.symbolsCache.values()) {
+            for (const symbol of symbols) {
+                if (symbol.type === "variable" && symbol.id === varId) {
+                    return symbol;
+                }
+            }
+        }
+        return null;
+    }
+
     protected defineSymbolInWorkspace(symbol: BlocksSymbol, workspace: Blockly.Workspace) {
         const map = workspace.getVariableMap();
 

pxtblocks/builtins/variables.ts

@@ -4,6 +4,7 @@ import { installBuiltinHelpInfo, setBuiltinHelpInfo } from "../help";
 import { EXPORTED_VARIABLE_TYPE, IMPORTED_VARIABLE_TYPE } from "../blocksProgram";
 
 export const CREATE_VAR_BTN_ID = 'create-variable-btn';
+export const CREATE_GLOBAL_VAR_BTN_ID = 'create-global-variable-btn';
 
 export function initVariables() {
     let varname = lf("{id:var}item");
@@ -96,7 +97,7 @@ export function initVariables() {
     const variablesGetDef = pxt.blocks.getBlockDefinition(variablesGetId);
     msg.VARIABLES_GET_CREATE_SET = variablesGetDef.block["VARIABLES_GET_CREATE_SET"];
     Blockly.Blocks[variablesGetId] = {
-        init: function() {
+        init: function () {
             this.jsonInit(
                 {
                     "type": "variables_get",
@@ -106,7 +107,7 @@ export function initVariables() {
                             "type": "field_variable",
                             "name": "VAR",
                             "variable": "%{BKY_VARIABLES_DEFAULT_NAME}",
-                            "variableTypes": [""],
+                            "variableTypes": ["", IMPORTED_VARIABLE_TYPE, EXPORTED_VARIABLE_TYPE],
                         },
                     ],
                     "output": null,
@@ -137,22 +138,22 @@ export function initVariables() {
     msg.VARIABLES_DEFAULT_NAME = varname;
     msg.VARIABLES_SET_CREATE_GET = lf("Create 'get %1'");
     Blockly.Blocks[variablesSetId] = {
-        init: function() {
+        init: function () {
             this.jsonInit(
                 {
                     "type": "variables_set",
                     "message0": "%{BKY_VARIABLES_SET}",
                     "args0": [
-                    {
-                        "type": "field_variable",
-                        "name": "VAR",
-                        "variable": "%{BKY_VARIABLES_DEFAULT_NAME}",
-                        "variableTypes": [""],
-                    },
-                    {
-                        "type": "input_value",
-                        "name": "VALUE",
-                    },
+                        {
+                            "type": "field_variable",
+                            "name": "VAR",
+                            "variable": "%{BKY_VARIABLES_DEFAULT_NAME}",
+                            "variableTypes": ["", IMPORTED_VARIABLE_TYPE, EXPORTED_VARIABLE_TYPE],
+                        },
+                        {
+                            "type": "input_value",
+                            "name": "VALUE",
+                        },
                     ],
                     "previousStatement": null,
                     "nextStatement": null,
@@ -179,7 +180,7 @@ export function initVariables() {
                         "type": "field_variable",
                         "name": "VAR",
                         "variable": varname,
-                        "variableTypes": [""]
+                        "variableTypes": ["", IMPORTED_VARIABLE_TYPE, EXPORTED_VARIABLE_TYPE]
                     },
                     {
                         "type": "input_value",
@@ -247,11 +248,22 @@ function flyoutCategory(workspace: Blockly.WorkspaceSvg, useXml: boolean): Eleme
     // This id is used to re-focus the create variable button after the dialog is closed.
     button.setAttribute('id', CREATE_VAR_BTN_ID);
 
+    const globalButton = document.createElement('button') as HTMLElement;
+    globalButton.setAttribute('text', lf("Make a Global Variable..."));
+    globalButton.setAttribute('callbackKey', 'CREATE_GLOBAL_VARIABLE');
+    // This id is used to re-focus the create variable button after the dialog is closed.
+    globalButton.setAttribute('id', CREATE_GLOBAL_VAR_BTN_ID);
+
     workspace.registerButtonCallback('CREATE_VARIABLE', function (button) {
         Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace());
     });
 
+    workspace.registerButtonCallback('CREATE_GLOBAL_VARIABLE', function (button) {
+        Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(), null, EXPORTED_VARIABLE_TYPE);
+    });
+
     xmlList.push(button);
+    xmlList.push(globalButton);
 
     const blockList = Blockly.Variables.flyoutCategoryBlocks(workspace) as HTMLElement[];
     xmlList = xmlList.concat(blockList);

pxtblocks/external.ts

@@ -1,4 +1,5 @@
 import * as Blockly from "blockly";
+import { BlocksProgram } from "./blocksProgram";
 
 let _promptTranslateBlock: (blockId: string, blockTranslationIds: string[]) => void;
 
@@ -129,4 +130,17 @@ export function getCopyPasteHandlers() {
         };
     }
     return null;
+}
+
+let _getGlobalProgram: () => BlocksProgram;
+
+export function setGetGlobalProgram(impl: () => BlocksProgram) {
+    _getGlobalProgram = impl;
+}
+
+export function getGlobalProgram() {
+    if (_getGlobalProgram) {
+        return _getGlobalProgram();
+    }
+    return null;
 }

webapp/src/blocks.tsx

@@ -809,6 +809,7 @@ export class Editor extends toolboxeditor.ToolboxEditor {
         }
         this.blocksProgram = new MultiWorkspaceBlocksProgram(host, this.editor);
         pxtblockly.contextMenu.setupWorkspaceContextMenu(this.editor);
+        pxtblockly.external.setGetGlobalProgram(() => this.blocksProgram);
 
         // set Blockly Colors
         (async () => {