languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 00:29:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pad line number appropriately when generating script insets.

Browse source 
This avoid jagged indentation when we jump from 9->10, 99->100, etc.

BUG=
R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/1402193003 .
This commit is contained in:
Todd Turnidge 2015-10-14 13:28:33 -07:00
parent ecd7457bb3
commit f5a07f6a9c
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
runtime/observatory/lib/src/elements/script_inset.dart
View file

@ -824,6 +824,11 @@ class ScriptInsetElement extends ObservatoryElement {
return table;
}
var endLine = (endPos != null
? script.tokenToLine(endPos)
: script.lines.length + script.lineOffset);
var lineNumPad = endLine.toString().length;
annotationsCursor = 0;
int blankLineCount = 0;
@ -840,17 +845,17 @@ class ScriptInsetElement extends ObservatoryElement {
if (blankLineCount < 4) {
// Too few blank lines for an elipsis.
for (int j = firstBlank; j <= lastBlank; j++) {
table.append(lineElement(script.getLine(j)));
table.append(lineElement(script.getLine(j), lineNumPad));
}
} else {
// Add an elipsis for the skipped region.
table.append(lineElement(script.getLine(firstBlank)));
table.append(lineElement(null));
table.append(lineElement(script.getLine(lastBlank)));
table.append(lineElement(script.getLine(firstBlank), lineNumPad));
table.append(lineElement(null, lineNumPad));
table.append(lineElement(script.getLine(lastBlank), lineNumPad));
}
blankLineCount = 0;
}
table.append(lineElement(line));
table.append(lineElement(line, lineNumPad));
}
}
@ -876,11 +881,11 @@ class ScriptInsetElement extends ObservatoryElement {
return annotation;
}
Element lineElement(ScriptLine line) {
Element lineElement(ScriptLine line, int lineNumPad) {
var e = new DivElement();
e.classes.add("sourceRow");
e.append(lineBreakpointElement(line));
e.append(lineNumberElement(line));
e.append(lineNumberElement(line, lineNumPad));
e.append(lineSourceElement(line));
return e;
}
@ -952,9 +957,9 @@ class ScriptInsetElement extends ObservatoryElement {
return e;
}
Element lineNumberElement(ScriptLine line) {
Element lineNumberElement(ScriptLine line, int lineNumPad) {
var lineNumber = line == null ? "..." : line.line;
var e = span("$nbsp$lineNumber$nbsp");
var e = span("$nbsp${lineNumber.toString().padLeft(lineNumPad,nbsp)}$nbsp");
e.classes.add('noCopy');
if (lineNumber == _currentLine) {