SONARPY-623 Fix handling of backslash followed by empty line (SonarSource#641)

pynicolas · web-flow · commit ebbe2bd93ba3 · 2020-03-18T09:46:28.000+01:00
diff --git a/python-frontend/src/main/java/org/sonar/python/lexer/NewLineChannel.java b/python-frontend/src/main/java/org/sonar/python/lexer/NewLineChannel.java
@@ -46,7 +46,8 @@ public boolean consume(CodeReader code, Lexer output) {
     if ((ch == '\\') && isNewLine(code.charAt(1))) {
       // Explicit line joining
       code.pop();
-      joinLines(code);
+      consumeEOL(code);
+      lexerState.joined = true;
       return true;
     }
 
diff --git a/python-frontend/src/test/java/org/sonar/python/lexer/PythonLexerTest.java b/python-frontend/src/test/java/org/sonar/python/lexer/PythonLexerTest.java
@@ -285,6 +285,7 @@ public void explicit_line_joining() {
     assertThat(lexer.lex("line\\\r\nline"), not(hasToken(PythonTokenType.NEWLINE)));
     assertThat(lexer.lex("line\\\rline"), not(hasToken(PythonTokenType.NEWLINE)));
     assertThat(lexer.lex("line\\\nline"), not(hasToken(PythonTokenType.NEWLINE)));
+    assertThat(lexer.lex("line\\\n\nline"), hasToken(PythonTokenType.NEWLINE));
 
     assertThat(lexer.lex("line\\\n    line")).hasSize(3);
   }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ public boolean consume(CodeReader code, Lexer output) {`
`46`	`46`	`if ((ch == '\\') && isNewLine(code.charAt(1))) {`
`47`	`47`	`// Explicit line joining`
`48`	`48`	`code.pop();`
`49`		`- joinLines(code);`
	`49`	`+ consumeEOL(code);`
	`50`	`+ lexerState.joined = true;`
`50`	`51`	`return true;`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ public void explicit_line_joining() {`
`285`	`285`	`assertThat(lexer.lex("line\\\r\nline"), not(hasToken(PythonTokenType.NEWLINE)));`
`286`	`286`	`assertThat(lexer.lex("line\\\rline"), not(hasToken(PythonTokenType.NEWLINE)));`
`287`	`287`	`assertThat(lexer.lex("line\\\nline"), not(hasToken(PythonTokenType.NEWLINE)));`
	`288`	`+ assertThat(lexer.lex("line\\\n\nline"), hasToken(PythonTokenType.NEWLINE));`
`288`	`289`
`289`	`290`	`assertThat(lexer.lex("line\\\n line")).hasSize(3);`
`290`	`291`	`}`