diff options
| author | Per Bothner <per@bothner.com> | 2016-11-20 18:40:29 +0000 |
|---|---|---|
| committer | Per Bothner <per@bothner.com> | 2016-11-20 18:40:29 +0000 |
| commit | 0114b7fe88e0a33e1cd4ef5f7916ca9d8220fef7 (patch) | |
| tree | 5169ab41b67774ead6aac198996ef976a089a7bc | |
| parent | 4fa4cf7456b70cd79b5ceea6af7db76e746dde2f (diff) | |
* PrettyWriter.java: Fix to end-block handling for isDomTerm().import-from-subversion
| -rw-r--r-- | gnu/kawa/io/ChangeLog | 4 | ||||
| -rw-r--r-- | gnu/kawa/io/PrettyWriter.java | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gnu/kawa/io/ChangeLog b/gnu/kawa/io/ChangeLog index d8bb2c7f5..cb29f4ab5 100644 --- a/gnu/kawa/io/ChangeLog +++ b/gnu/kawa/io/ChangeLog @@ -1,3 +1,7 @@ +2016-11-20 Per Bothner <per@bothner.com> + + * PrettyWriter.java: Fix to end-block handling for isDomTerm(). + 2016-11-19 Per Bothner <per@bothner.com> * JLineInPort.java (<init>): Set MOUSE support option. diff --git a/gnu/kawa/io/PrettyWriter.java b/gnu/kawa/io/PrettyWriter.java index 7bb98531b..409713fde 100644 --- a/gnu/kawa/io/PrettyWriter.java +++ b/gnu/kawa/io/PrettyWriter.java @@ -870,7 +870,8 @@ public class PrettyWriter extends PrintConsumer int suffixLength = getSuffixLength(); pushLogicalBlock(column, perLineEnd, prefixLength, suffixLength, lineNumber); - setIndentation(column); + if (!isDomTerm()) + setIndentation(column); if (prefix != null) { blocks[blockDepth + BLOCK_PER_LINE_PREFIX_END] = column; @@ -1444,8 +1445,11 @@ public class PrettyWriter extends PrintConsumer Strings.printJson(prefix, sbuf); sbuf.append("\007"); writeToBase(sbuf.toString()); - pushLogicalBlock(posnColumn(queueInts[next + QITEM_POSN]), - 0, 0, 0, 0); + String suffix = queueStrings[next + QITEM_BLOCK_START_SUFFIX]; + reallyStartLogicalBlock (posnColumn(queueInts[next + QITEM_POSN]), + "", suffix); + if (currentBlock == next) + currentBlock = -1; break; case QITEM_BLOCK_END_TYPE: writeToBase("\033]111\007"); |