From 22906c9fedb408bf6a901db64cb8050bf6dd116b Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 13 Apr 2016 18:55:21 +0200 Subject: [PATCH] #1217 PCode window not in same position as AS window: better fix (works when string contains only \r or \n characters, or any wrong combination, for example \n\r\n or \r\r\n) --- .../flash/helpers/HighlightedTextWriter.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/HighlightedTextWriter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/HighlightedTextWriter.java index 16d46f52b..fb92b0624 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/HighlightedTextWriter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/HighlightedTextWriter.java @@ -340,11 +340,23 @@ public class HighlightedTextWriter extends GraphTextWriter { } private void fixNewLineCount(String str) { + int nl = 0; + int rn = 0; + char prevChar = 0; for (int i = 0; i < str.length(); i++) { - if (str.charAt(i) == '\r') { - newLineCount++; + char ch = str.charAt(i); + if (ch == '\r' || ch == '\n') { + rn++; } + + if (ch == '\r' || (prevChar != '\r' && ch == '\n')) { + nl++; + } + + prevChar = ch; } + + newLineCount += rn - nl; } private void appendIndent() {