Issue #3225: fixed cr lines in TreeWalker (#3226)

3 files changed, 41 insertions, 1 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/AstRegressionTest.java
index 34c48fa10..6e022b02f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/AstRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/AstRegressionTest.java
@@ -162,6 +162,12 @@ public class AstRegressionTest extends BaseCheckTestSupport {
     }
 
     @Test
+    public void testNewlineCr() throws Exception {
+        verifyAst(super.getPath("/checks/InputNewlineCrAtEndOfFileAst.txt"),
+                super.getPath("/checks/InputNewlineCrAtEndOfFile.java"), true);
+    }
+
+    @Test
     public void testImpossibleExceptions() throws Exception {
         AssertGeneratedJavaLexer.verifyFail("mSTD_ESC", 'a');
         AssertGeneratedJavaLexer.verifyFail("mSTD_ESC", '0', (char) 0xFFFF);
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java
index 1305a0c00..8c097b1b0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java
@@ -1 +1 @@
-////////////////////////////////////////////////////////////////////////////////
// Test case file for checkstyle.
// Created: 2015
////////////////////////////////////////////////////////////////////////////////
package com.puppycrawl.tools.checkstyle.checks;

/**
 * Test case for detection of an existing CR newline at EOF, using the 
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineCrAtEndOfFile
{
}
\ No newline at end of file
+////////////////////////////////////////////////////////////////////////////////
// Test case file for checkstyle.
// Created: 2015
////////////////////////////////////////////////////////////////////////////////
package com.puppycrawl.tools.checkstyle.checks;

/**
 * Test case for detection of an existing CR newline at EOF, using the 
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineCrAtEndOfFile
{
/** Test with ending with CR newline
*/
}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFileAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFileAst.txt
new file mode 100644
index 000000000..9d1e889cc
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFileAst.txt
@@ -0,0 +1,34 @@
+SINGLE_LINE_COMMENT -> // [1:0]
+`--COMMENT_CONTENT -> //////////////////////////////////////////////////////////////////////////////\r [1:2]
+SINGLE_LINE_COMMENT -> // [2:0]
+`--COMMENT_CONTENT ->  Test case file for checkstyle.\r [2:2]
+SINGLE_LINE_COMMENT -> // [3:0]
+`--COMMENT_CONTENT ->  Created: 2015\r [3:2]
+SINGLE_LINE_COMMENT -> // [4:0]
+`--COMMENT_CONTENT -> //////////////////////////////////////////////////////////////////////////////\r [4:2]
+PACKAGE_DEF -> package [5:0]
+|--ANNOTATIONS -> ANNOTATIONS [5:39]
+|--DOT -> . [5:39]
+|   |--DOT -> . [5:28]
+|   |   |--DOT -> . [5:22]
+|   |   |   |--DOT -> . [5:11]
+|   |   |   |   |--IDENT -> com [5:8]
+|   |   |   |   `--IDENT -> puppycrawl [5:12]
+|   |   |   `--IDENT -> tools [5:23]
+|   |   `--IDENT -> checkstyle [5:29]
+|   `--IDENT -> checks [5:40]
+`--SEMI -> ; [5:46]
+INTERFACE_DEF -> INTERFACE_DEF [12:0]
+|--MODIFIERS -> MODIFIERS [12:0]
+|   |--BLOCK_COMMENT_BEGIN -> /* [7:0]
+|   |   |--COMMENT_CONTENT -> *\r * Test case for detection of an existing CR newline at EOF, using the \r * NewlineAtEndOfFileCheck.\r * @author Martin Steiger\r * [7:2]
+|   |   `--BLOCK_COMMENT_END -> */ [11:2]
+|   `--LITERAL_PUBLIC -> public [12:0]
+|--LITERAL_INTERFACE -> interface [12:7]
+|--IDENT -> InputNewlineCrAtEndOfFile [12:17]
+`--OBJBLOCK -> OBJBLOCK [13:0]
+    |--LCURLY -> { [13:0]
+    |--BLOCK_COMMENT_BEGIN -> /* [14:0]
+    |   |--COMMENT_CONTENT -> * Test with ending with CR newline\r [14:2]
+    |   `--BLOCK_COMMENT_END -> */ [15:0]
+    `--RCURLY -> } [16:0]