Fix some quality flaws

Author: vilchik-elena

python-checks/src/main/java/org/sonar/python/checks/LineLengthCheck.java

@@ -32,8 +32,8 @@
 
 @Rule(
     key = LineLengthCheck.CHECK_KEY,
-    priority = Priority.MINOR,
     name = "Lines should not be too long",
+    priority = Priority.MINOR,
     tags = Tags.CONVENTION
 )
 @SqaleConstantRemediation("1min")
@@ -42,6 +42,8 @@ public class LineLengthCheck extends SquidCheck<Grammar> implements AstAndTokenV
   public static final String CHECK_KEY = "LineLength";
   private static final int DEFAULT_MAXIMUM_LINE_LENGTH = 120;
 
+  private Token previousToken;
+
   @RuleProperty(
     key = "maximumLineLength",
     defaultValue = "" + DEFAULT_MAXIMUM_LINE_LENGTH)
@@ -51,8 +53,6 @@ public int getMaximumLineLength() {
     return maximumLineLength;
   }
 
-  private Token previousToken;
-
   @Override
   public void visitFile(AstNode astNode) {
     previousToken = null;
@@ -65,26 +65,28 @@ public void leaveFile(AstNode astNode) {
 
   @Override
   public void visitToken(Token token) {
-    if (!token.isGeneratedCode()) {
-      if (previousToken != null && previousToken.getLine() != token.getLine()) {
-        // Note that AbstractLineLengthCheck doesn't support tokens which span multiple lines - see SONARPLUGINS-2025
-        String[] lines = previousToken.getValue().split("\r?\n|\r", -1);
-        int length = previousToken.getColumn();
-        for (int line = 0; line < lines.length; line++) {
-          length += lines[line].length();
-          if (length > getMaximumLineLength()) {
-            // Note that method from AbstractLineLengthCheck generates other message - see SONARPLUGINS-1809
-            getContext().createLineViolation(this,
-              "The line contains {0,number,integer} characters which is greater than {1,number,integer} authorized.",
-              previousToken.getLine(),
-              length,
-              getMaximumLineLength());
-          }
-          length = 0;
+    if (token.isGeneratedCode()) {
+      return;
+    }
+
+    if (previousToken != null && previousToken.getLine() != token.getLine()) {
+      // Note that AbstractLineLengthCheck doesn't support tokens which span multiple lines - see SONARPLUGINS-2025
+      String[] lines = previousToken.getValue().split("\r?\n|\r", -1);
+      int length = previousToken.getColumn();
+      for (String line : lines) {
+        length += line.length();
+        if (length > getMaximumLineLength()) {
+          // Note that method from AbstractLineLengthCheck generates other message - see SONARPLUGINS-1809
+          getContext().createLineViolation(this,
+            "The line contains {0,number,integer} characters which is greater than {1,number,integer} authorized.",
+            previousToken.getLine(),
+            length,
+            getMaximumLineLength());
         }
+        length = 0;
       }
-      previousToken = token;
     }
+    previousToken = token;
   }
 
 }

python-squid/src/main/java/org/sonar/python/PythonLinesOfCodeVisitor.java

@@ -32,7 +32,7 @@
 /**
  * Visitor that computes the number of lines of code of a file.
  */
-public class PythonLinesOfCodeVisitor<GRAMMAR extends Grammar> extends SquidAstVisitor<GRAMMAR> implements AstAndTokenVisitor {
+public class PythonLinesOfCodeVisitor<G extends Grammar> extends SquidAstVisitor<G> implements AstAndTokenVisitor {
 
   private final MetricDef metric;
   private int lastTokenLine;

python-squid/src/main/java/org/sonar/python/lexer/PythonLexer.java

@@ -36,15 +36,15 @@
 
 public final class PythonLexer {
 
-  private PythonLexer() {
-  }
-
   private static final String EXP = "([Ee][+-]?+[0-9_]++)";
   private static final String BYTES_PREFIX = "([bB][Rr]?|[rR][bB]?)";
   private static final String IMAGINARY_SUFFIX = "(j|J)";
   private static final String LONG_INTEGER_SUFFIX = "(l|L)";
   private static final String FORMATTED_STRING_PREFIX = "([fF][rR]?|[rR][fF]?)";
 
+  private PythonLexer() {
+  }
+
   public static Lexer create(PythonConfiguration conf) {
     LexerState lexerState = new LexerState();