Merge branch 'harsh-kukreja-master'

docs/pages/release_notes.md

@@ -150,6 +150,7 @@ implementations, and their corresponding Parser if it exists (in the same packag
 *   [#2403](https://github.com/pmd/pmd/pull/2403): \[java] #2402 fix false-positives on Primitive Streams - [Bernd Farka](https://github.com/BerndFarkaDyna)
 *   [#2409](https://github.com/pmd/pmd/pull/2409): \[java] ClassNamingConventions suggests to add Util for class containing only static constants, fixes #1164 - [Binu R J](https://github.com/binu-r)
 *   [#2411](https://github.com/pmd/pmd/pull/2411): \[java] Fix UseAssertEqualsInsteadOfAssertTrue Example - [Moritz Scheve](https://github.com/Blightbuster)
+*   [#2423](https://github.com/pmd/pmd/pull/2423): \[core] Fix Checkstyle OperatorWrap in AbstractTokenizer - [Harsh Kukreja](https://github.com/harsh-kukreja)
 
 {% endtocmaker %}
 

pmd-core/src/main/java/net/sourceforge/pmd/cpd/AbstractTokenizer.java

@@ -117,14 +117,14 @@ public abstract class AbstractTokenizer implements Tokenizer {
             loc++;
         }
         // Handling multiple lines string
-        if (!done && // ... we didn't find the end of the string
-                loc >= currentLine.length() && // ... we have reach the end of
+        if (!done // ... we didn't find the end of the string
+                && loc >= currentLine.length() // ... we have reach the end of
                 // the line ( the String is
                 // incomplete, for the moment at
                 // least)
-                spanMultipleLinesString && // ... the language allow multiple
+                && spanMultipleLinesString // ... the language allow multiple
                 // line span Strings
-                lineNumber < code.size() - 1 // ... there is still more lines to
+                && lineNumber < code.size() - 1 // ... there is still more lines to
         // parse
         ) {
             // removes last character, if it is the line continuation (e.g.