From 04e39c20f8d7a7572acfeb2cc33ebd86d751a4b3 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Tue, 14 May 2019 16:55:52 -0700
Subject: [PATCH] Fix indentation bug if no xfix exists in function

---
 core/useragent.js                   | 3 +--
 generators/dart/procedures.js       | 4 +++-
 generators/javascript/procedures.js | 4 +++-
 generators/lua/procedures.js        | 4 +++-
 generators/php/procedures.js        | 4 +++-
 generators/python/procedures.js     | 4 +++-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/core/useragent.js b/core/useragent.js
index 1abc62855..1e2e87390 100644
--- a/core/useragent.js
+++ b/core/useragent.js
@@ -54,8 +54,7 @@ goog.provide('Blockly.userAgent');
 
   // Engines.  Logic from:
   // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/engine.js
-  Blockly.userAgent.WEBKIT = has('WebKit') &&
-      !Blockly.userAgent.EDGE;
+  Blockly.userAgent.WEBKIT = has('WebKit') && !Blockly.userAgent.EDGE;
   Blockly.userAgent.GECKO = has('Gecko') && !Blockly.userAgent.WEBKIT &&
       !Blockly.userAgent.IE && !Blockly.userAgent.EDGE;
 
diff --git a/generators/dart/procedures.js b/generators/dart/procedures.js
index efb432986..e6402a77b 100644
--- a/generators/dart/procedures.js
+++ b/generators/dart/procedures.js
@@ -40,7 +40,9 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
   if (Blockly.Dart.STATEMENT_SUFFIX) {
     xfix1 += Blockly.Dart.injectId(Blockly.Dart.STATEMENT_SUFFIX, block);
   }
-  xfix1 = Blockly.Dart.prefixLines(xfix1, Blockly.Dart.INDENT);
+  if (xfix1) {
+    xfix1 = Blockly.Dart.prefixLines(xfix1, Blockly.Dart.INDENT);
+  }
   var loopTrap = '';
   if (Blockly.Dart.INFINITE_LOOP_TRAP) {
     loopTrap = Blockly.Dart.prefixLines(
diff --git a/generators/javascript/procedures.js b/generators/javascript/procedures.js
index cd6767daa..86ee28b21 100644
--- a/generators/javascript/procedures.js
+++ b/generators/javascript/procedures.js
@@ -42,7 +42,9 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) {
     xfix1 += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_SUFFIX,
         block);
   }
-  xfix1 = Blockly.JavaScript.prefixLines(xfix1, Blockly.JavaScript.INDENT);
+  if (xfix1) {
+    xfix1 = Blockly.JavaScript.prefixLines(xfix1, Blockly.JavaScript.INDENT);
+  }
   var loopTrap = '';
   if (Blockly.JavaScript.INFINITE_LOOP_TRAP) {
     loopTrap = Blockly.JavaScript.prefixLines(
diff --git a/generators/lua/procedures.js b/generators/lua/procedures.js
index 32462b3af..1a5b605dc 100644
--- a/generators/lua/procedures.js
+++ b/generators/lua/procedures.js
@@ -40,7 +40,9 @@ Blockly.Lua['procedures_defreturn'] = function(block) {
   if (Blockly.Lua.STATEMENT_SUFFIX) {
     xfix1 += Blockly.Lua.injectId(Blockly.Lua.STATEMENT_SUFFIX, block);
   }
-  xfix1 = Blockly.Lua.prefixLines(xfix1, Blockly.Lua.INDENT);
+  if (xfix1) {
+    xfix1 = Blockly.Lua.prefixLines(xfix1, Blockly.Lua.INDENT);
+  }
   var loopTrap = '';
   if (Blockly.Lua.INFINITE_LOOP_TRAP) {
     loopTrap = Blockly.Lua.prefixLines(
diff --git a/generators/php/procedures.js b/generators/php/procedures.js
index e567068b1..f66703d10 100644
--- a/generators/php/procedures.js
+++ b/generators/php/procedures.js
@@ -61,7 +61,9 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
   if (Blockly.PHP.STATEMENT_SUFFIX) {
     xfix1 += Blockly.PHP.injectId(Blockly.PHP.STATEMENT_SUFFIX, block);
   }
-  xfix1 = Blockly.PHP.prefixLines(xfix1, Blockly.PHP.INDENT);
+  if (xfix1) {
+    xfix1 = Blockly.PHP.prefixLines(xfix1, Blockly.PHP.INDENT);
+  }
   var loopTrap = '';
   if (Blockly.PHP.INFINITE_LOOP_TRAP) {
     loopTrap = Blockly.PHP.prefixLines(
diff --git a/generators/python/procedures.js b/generators/python/procedures.js
index 2455c2903..daec89855 100644
--- a/generators/python/procedures.js
+++ b/generators/python/procedures.js
@@ -62,7 +62,9 @@ Blockly.Python['procedures_defreturn'] = function(block) {
   if (Blockly.Python.STATEMENT_SUFFIX) {
     xfix1 += Blockly.Python.injectId(Blockly.Python.STATEMENT_SUFFIX, block);
   }
-  xfix1 = Blockly.Python.prefixLines(xfix1, Blockly.Python.INDENT);
+  if (xfix1) {
+    xfix1 = Blockly.Python.prefixLines(xfix1, Blockly.Python.INDENT);
+  }
   var loopTrap = '';
   if (Blockly.Python.INFINITE_LOOP_TRAP) {
     loopTrap = Blockly.Python.prefixLines(