diff options
| author | Andrey Somov <asomov@unifonic.com> | 2021-12-14 15:06:54 +0400 |
|---|---|---|
| committer | Andrey Somov <asomov@unifonic.com> | 2021-12-14 15:17:22 +0400 |
| commit | 7423d03835f02a0067831bb9e0ff3b0d3f143f03 (patch) | |
| tree | 8684817d1fe5dbeacd8a5b7db08c5c4aa4bdff05 /src/main/java/org/yaml/snakeyaml | |
| parent | 32841c105c2f0611e35c1849ecb26db49141cc68 (diff) | |
| download | snakeyaml-7423d03835f02a0067831bb9e0ff3b0d3f143f03.tar.gz | |
Do not use Mark in business logic
Diffstat (limited to 'src/main/java/org/yaml/snakeyaml')
| -rw-r--r-- | src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java b/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java index 67a24905..31a51e52 100644 --- a/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java +++ b/src/main/java/org/yaml/snakeyaml/scanner/ScannerImpl.java @@ -1222,6 +1222,7 @@ public final class ScannerImpl implements Scanner { int inlineStartColumn = -1; while (!found) { Mark startMark = reader.getMark(); + int columnBeforeComment = reader.getColumn(); boolean commentSeen = false; int ff = 0; // Peek ahead until we find the first non-space character, then @@ -1239,8 +1240,7 @@ public final class ScannerImpl implements Scanner { if (reader.peek() == '#') { commentSeen = true; CommentType type; - if(startMark.getColumn() != 0 - && !(lastToken != null && lastToken.getTokenId() == Token.ID.BlockEntry)) { + if(columnBeforeComment != 0 && !(lastToken != null && lastToken.getTokenId() == Token.ID.BlockEntry)) { type = CommentType.IN_LINE; inlineStartColumn = reader.getColumn(); } else if(inlineStartColumn == reader.getColumn()) { @@ -1259,7 +1259,7 @@ public final class ScannerImpl implements Scanner { String breaks = scanLineBreak(); if (breaks.length() != 0) {// found a line-break if (parseComments && ! commentSeen) { - if (startMark.getColumn() == 0) { + if (columnBeforeComment == 0) { Mark endMark = reader.getMark(); addToken(new CommentToken(CommentType.BLANK_LINE, breaks, startMark, endMark)); } |