Comment includes only line number of the offense

Request in ManageIQ#406 to remove addition "column" information about the offence
europ · Mar 6, 2018 · 5ba0ef1 · 5ba0ef1
1 parent 1fb4ca1
commit 5ba0ef1
Show file tree

Hide file tree

Showing 12 changed files with 318 additions and 2,763 deletions.
diff --git a/app/workers/commit_monitor_handlers/commit_range/rubocop_checker/message_builder.rb b/app/workers/commit_monitor_handlers/commit_range/rubocop_checker/message_builder.rb
@@ -78,7 +78,7 @@ def offenses
           SEVERITY_MAP[o["severity"]],
           format_message(o),
           f["path"],
-          format_locator(f, o)
+          format_line(f, o)
         )
       end
     end.flatten
@@ -96,22 +96,13 @@ def format_cop_name(cop_name)
     COP_URIS[cop_name] || cop_name
   end
 
-  def format_locator(file, offense)
-    [format_line(file, offense), format_column(offense)].compact.join(", ").presence
-  end
-
   def format_line(file, offense)
-    line = offense.fetch_path("location", "line")
+    line = offense.fetch_path("line")
     return nil unless line
     uri = File.join(line_uri, "blob", commits.last, file["path"]) << "#L#{line}"
     "[Line #{line}](#{uri})"
   end
 
-  def format_column(offense)
-    column = offense.fetch_path("location", "column")
-    column && "Col #{column}"
-  end
-
   # TODO: Don't reuse the commit_uri.  This should probably be its own URI.
   def line_uri
     branch.commit_uri.chomp("commit/$commit")

diff --git a/app/workers/commit_monitor_handlers/commit_range/rubocop_checker/rubocop_results_filter.rb b/app/workers/commit_monitor_handlers/commit_range/rubocop_checker/rubocop_results_filter.rb
@@ -26,7 +26,7 @@ def filter_on_diff
           @results["files"].each do |f|
             f["offenses"].select! do |o|
               o["severity"].in?(%w(error fatal)) ||
-                @diff_details[f["path"]].include?(o["location"]["line"])
+                @diff_details[f["path"]].include?(o["line"])
             end
           end
         end

diff --git a/app/workers/concerns/code_analysis_mixin.rb b/app/workers/concerns/code_analysis_mixin.rb
@@ -72,11 +72,7 @@ def run_all_linters
               "message"   => msg.msg,
               "cop_name"  => msg.runner,
               "corrected" => false,
-              "location"  => {
-                "line"   => msg.line.position,
-                "column" => 0, # TODO: value cannot be obtained from Pronto::Message
-                "length" => msg.line.length,
-              }
+              "line"      => msg.line.position
             }
           end
         }

diff --git a/...or_handlers/commit_range/rubocop_checker/data/with_haml_file_using_haml-lint/results.json b/...or_handlers/commit_range/rubocop_checker/data/with_haml_file_using_haml-lint/results.json
@@ -13,9 +13,7 @@
         {
           "severity": "error",
           "message": "You don't need to use \"- end\" in Haml. Un-indent to close a block:\n- if foo?\n  %strong Foo!\n- else\n  Not foo.\n%p This line is un-indented, so it isn't part of the \"if\" block",
-          "location": {
-            "line": 3
-          }
+          "line": 3
         }
       ]
     }

diff --git a/...onitor_handlers/commit_range/rubocop_checker/data/with_lines_not_in_the_diff/results.json b/...onitor_handlers/commit_range/rubocop_checker/data/with_lines_not_in_the_diff/results.json
@@ -15,45 +15,21 @@
           "message": "Freeze mutable objects assigned to constants.",
           "cop_name": "Style/MutableConstant",
           "corrected": false,
-          "location": {
-            "start_line": 2,
-            "start_column": 10,
-            "last_line": 6,
-            "last_column": 3,
-            "length": 78,
-            "line": 2,
-            "column": 10
-          }
+          "line": 2
         },
         {
           "severity": "convention",
           "message": "Align the elements of a hash literal if they span more than one line.",
           "cop_name": "Layout/AlignHash",
           "corrected": false,
-          "location": {
-            "start_line": 3,
-            "start_column": 5,
-            "last_line": 3,
-            "last_column": 20,
-            "length": 16,
-            "line": 3,
-            "column": 5
-          }
+          "line": 3
         },
         {
           "severity": "convention",
           "message": "Align the elements of a hash literal if they span more than one line.",
           "cop_name": "Layout/AlignHash",
           "corrected": false,
-          "location": {
-            "start_line": 4,
-            "start_column": 5,
-            "last_line": 4,
-            "last_column": 22,
-            "length": 18,
-            "line": 4,
-            "column": 5
-          }
+          "line": 4
         }
       ]
     }