SONARPY-247 Fix new FPs for CommentedCodeCheck

pynicolas · alban-auzeill · commit 6848753fdf9e · 2018-01-16T15:03:05.000+01:00
diff --git a/its/ruling/src/test/resources/expected/python-S125.json b/its/ruling/src/test/resources/expected/python-S125.json
@@ -24,6 +24,9 @@
 'project:buildbot-0.8.6p1/buildbot/status/builder.py':[
 74,
 ],
+'project:buildbot-0.8.6p1/buildbot/status/master.py':[
+384,
+],
 'project:buildbot-0.8.6p1/buildbot/status/progress.py':[
 237,
 ],
diff --git a/python-checks/src/main/java/org/sonar/python/checks/CommentedCodeCheck.java b/python-checks/src/main/java/org/sonar/python/checks/CommentedCodeCheck.java
@@ -137,8 +137,13 @@ private static boolean isTextParsedAsCode(String text) {
     }
   }
 
-  private static boolean isSimpleExpression(List<AstNode> expressions) {
-    return expressions.size() == 1 && expressions.get(0).getNumberOfChildren() == 1 && expressions.get(0).getFirstChild().is(PythonGrammar.TESTLIST_STAR_EXPR);
+  private static boolean isSimpleExpression(List<AstNode> expressionStatements) {
+    if (expressionStatements.size() != 1) {
+      return false;
+    }
+    AstNode expressionStatement = expressionStatements.get(0);
+    return (expressionStatement.getNumberOfChildren() == 1 && expressionStatement.getFirstChild().is(PythonGrammar.TESTLIST_STAR_EXPR))
+      || expressionStatement.hasDirectChildren(PythonGrammar.ANNASSIGN);
   }
 
   private static List<List<Trivia>> groupTrivias(Token token) {
diff --git a/python-checks/src/test/resources/checks/commentedCode.py b/python-checks/src/test/resources/checks/commentedCode.py
@@ -86,3 +86,5 @@
 '''
 # comment
 '''
+
+# TODO: something

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,13 @@ private static boolean isTextParsedAsCode(String text) {`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- private static boolean isSimpleExpression(List<AstNode> expressions) {`
`141`		`- return expressions.size() == 1 && expressions.get(0).getNumberOfChildren() == 1 && expressions.get(0).getFirstChild().is(PythonGrammar.TESTLIST_STAR_EXPR);`
	`140`	`+ private static boolean isSimpleExpression(List<AstNode> expressionStatements) {`
	`141`	`+ if (expressionStatements.size() != 1) {`
	`142`	`+ return false;`
	`143`	`+ }`
	`144`	`+ AstNode expressionStatement = expressionStatements.get(0);`
	`145`	`+ return (expressionStatement.getNumberOfChildren() == 1 && expressionStatement.getFirstChild().is(PythonGrammar.TESTLIST_STAR_EXPR))`
	`146`	`+ \|\| expressionStatement.hasDirectChildren(PythonGrammar.ANNASSIGN);`
`142`	`147`	`}`
`143`	`148`
`144`	`149`	`private static List<List<Trivia>> groupTrivias(Token token) {`