Browse Source

small changes

cl-refactor
yann300 10 years ago
parent
commit
6ec7a618c2
  1. 1
      mix/qml/Debugger.qml
  2. 5
      mix/qml/WebCodeEditor.qml

1
mix/qml/Debugger.qml

@ -4,7 +4,6 @@ import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import QtGraphicalEffects 1.0
import "js/Debugger.js" as Debugger import "js/Debugger.js" as Debugger
import "js/ErrorLocationFormater.js" as ErrorLocationFormater import "js/ErrorLocationFormater.js" as ErrorLocationFormater
import "." import "."

5
mix/qml/WebCodeEditor.qml

@ -155,14 +155,15 @@ Item {
for (var k in secondLocations) for (var k in secondLocations)
{ {
lineError = secondLocations[k].start.line + 1; lineError = secondLocations[k].start.line + 1;
secondErrorDetail += secondLocations[k].contractName + " line " + lineError + ", "; secondErrorDetail += secondLocations[k].contractName + " line " + lineError + " - ";
displayErrorAnnotations(secondLocations[k], errorOrigin, "second"); displayErrorAnnotations(secondLocations[k], errorOrigin, "second");
} }
var detail = error.split('\n')[0]; var detail = error.split('\n')[0];
var reg = detail.match(/:\d+:\d+:/g); var reg = detail.match(/:\d+:\d+:/g);
if (reg !== null) if (reg !== null)
detail = detail.replace(reg[0], ""); detail = detail.replace(reg[0], "");
detail += secondErrorDetail; if (secondLocations.length > 0)
detail += secondErrorDetail;
displayErrorAnnotations(firstLocation, detail, "first"); displayErrorAnnotations(firstLocation, detail, "first");
} }

Loading…
Cancel
Save