Jackmcbarn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/220704

Change subject: Display backtraces in the Scribunto console
......................................................................

Display backtraces in the Scribunto console

When the Scribunto console produces an error, display a full backtrace
instead of just the error message.

Change-Id: I305438284eae8e19a51a70b1e83d54e4831de396
---
M engines/LuaCommon/LuaCommon.php
M modules/ext.scribunto.edit.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/04/220704/1

diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index c7316a5..47731ed 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -958,7 +958,7 @@
                                $backtraceLine = 
$backtraceLine->inContentLanguage()->parse() :
                                $backtraceLine = $backtraceLine->parse();
 
-                       $s .= "<li>\n\t" . $backtraceLine  . "\n</li>\n";
+                       $s .= "<li>$backtraceLine</li>";
                }
                $s .= '</ol>';
                return $s;
diff --git a/modules/ext.scribunto.edit.js b/modules/ext.scribunto.edit.js
index e625d49..7efbf66 100644
--- a/modules/ext.scribunto.edit.js
+++ b/modules/ext.scribunto.edit.js
@@ -295,7 +295,7 @@
                                sessionKey = result.session;
                                sessionContent = content;
                                if ( result.type === 'error' ) {
-                                       printError( result.message );
+                                       $( output ).append( '<div 
class="mw-scribunto-error">' + result.html + '</div>' );
                                } else {
                                        if ( result.print !== '' ) {
                                                println( result.print, 
'mw-scribunto-print' );

-- 
To view, visit https://gerrit.wikimedia.org/r/220704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I305438284eae8e19a51a70b1e83d54e4831de396
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn <jackmcb...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to