Merge pull request #1948 from montegoulding/bugfix-20094

livecodeali · web-flow · commit f685e7f37afb · 2018-04-18T09:33:18.000+01:00
[[ Bug 20094 ]] Execute msg box if it compiles
diff --git a/Toolset/libraries/revidelibrary.8.livecodescript b/Toolset/libraries/revidelibrary.8.livecodescript
@@ -11514,7 +11514,11 @@ command ideExecuteScript pScript, pObject, pDebugMode, @rValidScript
    end if
    
    if tValidScript is empty then
-      return tOriginalCompileError for error
+      if tOriginalCompileError is not empty then
+         return tOriginalCompileError for error
+      else
+         put pScript into tValidScript
+      end if
    end if
    unlock screen
    
diff --git a/notes/bugfix-20094.md b/notes/bugfix-20094.md
@@ -0,0 +1 @@
+# Fix multi-line message box not executing if the first line is a comment
diff --git a/tests/messagebox/execution.livecodescript b/tests/messagebox/execution.livecodescript
@@ -319,10 +319,28 @@ on TestReferenceControlOnActiveStack
 	create stack
 	set the defaultStack to the short name of it
 	
-	local tToExecute
+	local tToExecute, tValidScript
 	put "put bar into field 1" into tToExecute
 	ideExecuteScript tToExecute, tStack, false, tValidScript
 	
 	TestAssert "intelligence object command two params result", the text of tField is "bar"
 	TestAssert "intelligence object command two params executed", tValidScript is tToExecute
-end TestReferenceControlOnActiveStack
+end TestReferenceControlOnActiveStack
+
+-- bug 20084
+on TestMutilineWithCommentOnFirstLine
+	local tStack, tField
+	create stack
+	put it into tStack
+
+	set the defaultStack to the short name of tStack
+	
+	create field
+	put it into tField
+	
+	local tToExecute, tValidScript
+	put "-- foo" & return & "put bar into field 1" into tToExecute
+	ideExecuteScript tToExecute, tStack, false, tValidScript
+	
+	TestAssert "multiline script with comment on first line executes", the text of tField is "bar"
+end TestMutilineWithCommentOnFirstLine

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix multi-line message box not executing if the first line is a comment`