Merge pull request #499 from NipunaMarcus/master

Added return to the return statement
ballerina-attic · Feb 12, 2017 · 4fead06 · 4fead06
2 parents 0deb941 + 20dfea3
commit 4fead06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/modules/web/js/ballerina/ast/return-statement.js b/modules/web/js/ballerina/ast/return-statement.js
@@ -24,7 +24,7 @@ define(['lodash', 'log', './statement'], function (_, log, Statement) {
      */
     var ReturnStatement = function (args) {
         Statement.call(this);
-        this._expression = _.get(args, 'expression') || 'expression';
+        this._expression = _.get(args, 'return') || 'return';
         this.type = "ReturnStatement";
     };
 

diff --git a/modules/web/js/ballerina/views/return-statement-view.js b/modules/web/js/ballerina/views/return-statement-view.js
@@ -85,6 +85,9 @@ define(['lodash', 'log', './../ast/return-statement', './simple-statement-view',
         };
 
         ReturnStatementView.prototype.updateReturnExpression = function (newReturnExpression, propertyKey) {
+            if(!newReturnExpression.startsWith("return")){
+                newReturnExpression = "return "+newReturnExpression;
+            }
             this._model.setReturnExpression(newReturnExpression);
             var displayText = this._model.getReturnExpression();
             this.renderDisplayText(displayText);