Merge pull request #26 from codacy/FT-3627-pylint-issues-not-being-reported

Change message_id and message order

Author: carlospinho04

src/main/resources/docs/patterns.json

@@ -47,6 +47,11 @@
       "level": "Info",
       "category": "CodeStyle"
     },
+    {
+      "patternId": "C0326",
+      "level": "Info",
+      "category": "CodeStyle"
+    },
     {
       "patternId": "C1001",
       "level": "Info",

src/main/resources/docs/tests/C0326.py

@@ -0,0 +1,8 @@
+##Patterns: C0326
+##Info: C0326
+def test(name) :
+    print 'Hello', name
+
+##Info: C0326
+def test (name):
+    print 'Hello', name

src/main/scala/codacy/pylint/Pylint.scala

@@ -48,24 +48,23 @@ object Pylint extends Tool {
     val classified = options.get(pythonVersionKey).fold {
       classifyFiles(collectedFiles)
     } { pythonVersion =>
-      val validPythonVersion = Option(pythonVersion : JsValue).collect {
+      val validPythonVersion = Option(pythonVersion: JsValue).collect {
         case JsNumber(version) => version
         case JsString(version) => Try(version.toInt)
       }.map(_.toString).getOrElse(python3)
       Try(Map(validPythonVersion -> collectedFiles.toArray))
     }
     val commands = classified.map { item => buildFileCommands(item) }
     val lines_iterable = commands.map { item => item.map(getStdout) }
-    val lines = lines_iterable.map {
+    val linesTry: Try[List[String]] = lines_iterable.map {
       iterable =>
         iterable.flatMap {
           item => item.toOption
         }.flatten
     }
-    lines.map { line => line.flatMap(parseLine).flatten.filter(isEnabled) }
+    linesTry.map { line => line.flatMap(parseLine).flatten.filter(isEnabled) }
   }
 
-
   private def parseLine(line: String) = {
     val LineRegex = """(.*?)###(\d*?)###(.*?)###(.*?)""".r
 
@@ -79,19 +78,19 @@ object Pylint extends Tool {
     }
 
     line match {
-      case LineRegex(filename, lineNumber, message, patternId) if message.contains("invalid syntax") =>
+      case LineRegex(filename, lineNumber, patternId, message) if message.contains("invalid syntax") =>
         val fileError = Result.FileError(Source.File(filename),
           Option(ErrorMessage(message)))
         val issue = createIssue(filename, lineNumber, message, patternId)
         Option(List(fileError, issue))
-      case LineRegex(filename, lineNumber, message, patternId) =>
+      case LineRegex(filename, lineNumber, patternId, message) =>
         Option(List(createIssue(filename, lineNumber, message, patternId)))
       case _ =>
         Option.empty
     }
   }
 
-  private val msgTemplate = "{path}###{line}###{msg}###{msg_id}"
+  private val msgTemplate = "{path}###{line}###{msg_id}###{msg}"
   private val classifyScript =
     s"""
        |import os