History

Merge branch master into protocol_changes

HifiExperiments committed 2 years ago

Commit ee705d21 parent f9e729b370 files · +11827 −6045Browse files

Showing the changes to libraries/script-engine/src/ConsoleScriptingInterface.cpp (1 of 370 files). Show all

Unified · Split

libraries/script-engine/src/ConsoleScriptingInterface.cpp+17−17
@@ -34,7 +34,7 @@ QList<QString> ConsoleScriptingInterface::_groupDetails = QList<QString>(); · 33 unmodified lines
3434
3535 ScriptValue ConsoleScriptingInterface::info(ScriptContext* context, ScriptEngine* engine) {
3636 if (ScriptManager* scriptManager = engine->manager()) {
37− scriptManager->scriptInfoMessage(appendArguments(context));
37+ scriptManager->scriptInfoMessage(appendArguments(context), context->currentFileName(), context->currentLineNumber());
3838 }
3939 return engine->nullValue();
4040 }
@@ -43,7 +43,7 @@ ScriptValue ConsoleScriptingInterface::log(ScriptContext* context, ScriptEngine* · 2 unmodified lines
4343 QString message = appendArguments(context);
4444 if (_groupDetails.count() == 0) {
4545 if (ScriptManager* scriptManager = engine->manager()) {
46− scriptManager->scriptPrintedMessage(message);
46+ scriptManager->scriptPrintedMessage(message, context->currentFileName(), context->currentLineNumber());
4747 }
4848 } else {
4949 logGroupMessage(message, engine);
@@ -53,28 +53,28 @@ ScriptValue ConsoleScriptingInterface::log(ScriptContext* context, ScriptEngine* · 3 unmodified lines
5353
5454 ScriptValue ConsoleScriptingInterface::debug(ScriptContext* context, ScriptEngine* engine) {
5555 if (ScriptManager* scriptManager = engine->manager()) {
56− scriptManager->scriptPrintedMessage(appendArguments(context));
56+ scriptManager->scriptPrintedMessage(appendArguments(context), context->currentFileName(), context->currentLineNumber());
5757 }
5858 return engine->nullValue();
5959 }
6060
6161 ScriptValue ConsoleScriptingInterface::warn(ScriptContext* context, ScriptEngine* engine) {
6262 if (ScriptManager* scriptManager = engine->manager()) {
63− scriptManager->scriptWarningMessage(appendArguments(context));
63+ scriptManager->scriptWarningMessage(appendArguments(context), context->currentFileName(), context->currentLineNumber());
6464 }
6565 return engine->nullValue();
6666 }
6767
6868 ScriptValue ConsoleScriptingInterface::error(ScriptContext* context, ScriptEngine* engine) {
6969 if (ScriptManager* scriptManager = engine->manager()) {
70− scriptManager->scriptErrorMessage(appendArguments(context));
70+ scriptManager->scriptErrorMessage(appendArguments(context), context->currentFileName(), context->currentLineNumber());
7171 }
7272 return engine->nullValue();
7373 }
7474
7575 ScriptValue ConsoleScriptingInterface::exception(ScriptContext* context, ScriptEngine* engine) {
7676 if (ScriptManager* scriptManager = engine->manager()) {
77− scriptManager->scriptErrorMessage(appendArguments(context));
77+ scriptManager->scriptErrorMessage(appendArguments(context), context->currentFileName(), context->currentLineNumber());
7878 }
7979 return engine->nullValue();
8080 }
@@ -82,23 +82,23 @@ ScriptValue ConsoleScriptingInterface::exception(ScriptContext* context, ScriptE · 1 unmodified line
8282 void ConsoleScriptingInterface::time(QString labelName) {
8383 _timerDetails.insert(labelName, QDateTime::currentDateTime().toUTC());
8484 QString message = QString("%1: Timer started").arg(labelName);
85− Q_ASSERT(engine);
85+ Q_ASSERT(engine());
8686 if (ScriptManager* scriptManager = engine()->manager()) {
87− scriptManager->scriptPrintedMessage(message);
87+ scriptManager->scriptPrintedMessage(message, context()->currentFileName(), context()->currentLineNumber());
8888 }
8989 }
9090
9191 void ConsoleScriptingInterface::timeEnd(QString labelName) {
92− Q_ASSERT(engine);
92+ Q_ASSERT(engine());
9393 if (ScriptManager* scriptManager = engine()->manager()) {
9494 if (!_timerDetails.contains(labelName)) {
95− scriptManager->scriptErrorMessage("No such label found " + labelName);
95+ scriptManager->scriptErrorMessage("No such label found " + labelName, context()->currentFileName(), context()->currentLineNumber());
9696 return;
9797 }
9898
9999 if (_timerDetails.value(labelName).isNull()) {
100100 _timerDetails.remove(labelName);
101− scriptManager->scriptErrorMessage("Invalid start time for " + labelName);
101+ scriptManager->scriptErrorMessage("Invalid start time for " + labelName, context()->currentFileName(), context()->currentLineNumber());
102102 return;
103103 }
104104 QDateTime _startTime = _timerDetails.value(labelName);
@@ -108,7 +108,7 @@ void ConsoleScriptingInterface::timeEnd(QString labelName) { · 3 unmodified lines
108108 QString message = QString("%1: %2ms").arg(labelName).arg(QString::number(diffInMS));
109109 _timerDetails.remove(labelName);
110110
111− scriptManager->scriptPrintedMessage(message);
111+ scriptManager->scriptPrintedMessage(message, context()->currentFileName(), context()->currentLineNumber());
112112 }
113113 }
114114
@@ -131,24 +131,24 @@ ScriptValue ConsoleScriptingInterface::assertion(ScriptContext* context, ScriptE · 16 unmodified lines
131131 assertionResult = QString("Assertion failed : %1").arg(message);
132132 }
133133 if (ScriptManager* scriptManager = engine->manager()) {
134− scriptManager->scriptErrorMessage(assertionResult);
134+ scriptManager->scriptErrorMessage(assertionResult, context->currentFileName(), context->currentLineNumber());
135135 }
136136 }
137137 return engine->nullValue();
138138 }
139139
140140 void ConsoleScriptingInterface::trace() {
141− Q_ASSERT(engine);
141+ Q_ASSERT(engine());
142142 ScriptEnginePointer scriptEngine = engine();
143143 if (ScriptManager* scriptManager = scriptEngine->manager()) {
144144 scriptManager->scriptPrintedMessage
145145 (QString(STACK_TRACE_FORMAT).arg(LINE_SEPARATOR,
146− scriptEngine->currentContext()->backtrace().join(LINE_SEPARATOR)));
146+ scriptEngine->currentContext()->backtrace().join(LINE_SEPARATOR)), context()->currentFileName(), context()->currentLineNumber());
147147 }
148148 }
149149
150150 void ConsoleScriptingInterface::clear() {
151− Q_ASSERT(engine);
151+ Q_ASSERT(engine());
152152 if (ScriptManager* scriptManager = engine()->manager()) {
153153 scriptManager->clearDebugLogWindow();
154154 }
@@ -190,6 +190,6 @@ void ConsoleScriptingInterface::logGroupMessage(QString message, ScriptEngine* e · 35 unmodified lines
190190 }
191191 logMessage.append(message);
192192 if (ScriptManager* scriptManager = engine->manager()) {
193− scriptManager->scriptPrintedMessage(logMessage);
193+ scriptManager->scriptPrintedMessage(logMessage, context()->currentFileName(), context()->currentLineNumber());
194194 }
195195 }