improved error handling

Change-Id: I3cd3632c17fb542cb0ab32a2ebebfc3c780aae22
Reviewed-by: Nicolas Arnaud-Cormos <[email protected]>

1 files changed, 6 insertions, 3 deletions

diff --git a/scriptrunner.cpp b/scriptrunner.cpp
index a02aaaf..5df00fc 100644
--- a/scriptrunner.cpp
+++ b/scriptrunner.cpp
@@ -59,12 +59,12 @@ ScriptRunner::~ScriptRunner()
 }
 
 
-bool ScriptRunner::runScript(const QString &sourceCode, const QString fileName)
+ErrorMessage ScriptRunner::runScript(const QString &sourceCode, const QString fileName)
 {
     ensureEngineInitialized();
 
     m_engine->pushContext();
-    m_engine->evaluate(sourceCode, fileName);
+    QScriptValue result = m_engine->evaluate(sourceCode, fileName);
 
     const bool failed = m_engine->hasUncaughtException();
     m_engine->popContext();
@@ -74,7 +74,10 @@ bool ScriptRunner::runScript(const QString &sourceCode, const QString fileName)
     if (editorManager->currentEditor())
         editorManager->currentEditor()->widget()->setFocus(Qt::OtherFocusReason);
 
-    return !failed;
+    if ( failed)
+        return ErrorMessage(m_engine->uncaughtExceptionLineNumber(), result.toString());
+
+    return ErrorMessage();
 }