Fix variable xml generation, console warnings

core/field.js

@@ -819,9 +819,10 @@ Blockly.Field.prototype.getSize = function() {
   if (this.isDirty_) {
     this.render_();
     this.isDirty_ = false;
-  } else if (this.visible_ && this.size_.width == 0) {
+  } else if (this.visible_ && this.size_.width == 0 && !this.sourceBlock_.isInsertionMarker_) {
     // If the field is not visible the width will be 0 as well, one of the
     // problems with the old system.
+    // pxt-blockly: field size will also be zero for insertion marker fields
     console.warn('Deprecated use of setting size_.width to 0 to rerender a' +
       ' field. Set field.isDirty_ to true instead.');
     this.render_();

core/field_image.js

@@ -59,6 +59,7 @@ Blockly.FieldImage = function(src, width, height,
   if (typeof opt_onClick == 'function') {
     this.clickHandler_ = opt_onClick;
     this.EDITABLE = true;
+    this.SERIALIZABLE = true;
   }
 };
 goog.inherits(Blockly.FieldImage, Blockly.Field);
@@ -90,6 +91,14 @@ Blockly.FieldImage.fromJson = function(options) {
  */
 Blockly.FieldImage.prototype.EDITABLE = false;
 
+/**
+ *  * Serializable fields are saved by the XML renderer, non-serializable fields
+ * are not. Editable fields should also be serializable.
+ * @type {boolean}
+ * @const
+ */
+Blockly.FieldImage.prototype.SERIALIZABLE = false;
+
 /**
  * Used to tell if the field needs to be rendered the next time the block is
  * rendered. Image fields are statically sized, and only need to be

core/utils.js

@@ -273,7 +273,8 @@ Blockly.utils.checkMessageReferences = function(message) {
   for (var i = 0; i < m.length; i++) {
     var msgKey = m[i].toUpperCase();
     if (msgTable[msgKey.slice(6, -1)] == undefined) {
-      console.log('WARNING: No message string for ' + m[i] + ' in ' + message);
+      // pxt-blockly: ignore, we use custom localization
+      // console.log('WARNING: No message string for ' + m[i] + ' in ' + message);
       validSoFar = false;  // Continue to report other errors.
     }
   }

core/xml.js

@@ -48,7 +48,8 @@ goog.require('Blockly.utils.xml');
 Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
   var xml = Blockly.utils.xml.createElement('xml');
   var variablesElement = Blockly.Xml.variablesToDom(
-      Blockly.Variables.allUsedVarModels(workspace));
+    // pxt-blockly: always output all variables
+      workspace.getAllVariables(workspace));
   if (variablesElement.hasChildNodes()) {
     xml.appendChild(variablesElement);
   }

typings/blockly.d.ts

@@ -8576,6 +8576,14 @@ declare module Blockly {
              */
             EDITABLE: boolean;
 
+            /**
+             *  * Serializable fields are saved by the XML renderer, non-serializable fields
+             * are not. Editable fields should also be serializable.
+             * @type {boolean}
+             * @const
+             */
+            SERIALIZABLE: boolean;
+
             /**
              * Used to tell if the field needs to be rendered the next time the block is
              * rendered. Image fields are statically sized, and only need to be