danger 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d07cd853986d22b15d4aed8699bd1877b506990221ccfd111dda79f004a4941
-  data.tar.gz: a5eff46697b1974fe5356a5276ee2913532732c6de08ab88d98eaedbb0131681
+  metadata.gz: 4004dbb1205aad12f66f5278fcf5baa4a5e052c0a93c2c3aff2192294fcd5912
+  data.tar.gz: f9efeacd037a59d541a6e948acbd3041793387e93ecf52a7368f2a7c0080dac1
 SHA512:
-  metadata.gz: f61272da6dbafad0f462d30567616125bdb31363ead8421b54c4fe302708848af0f90288a877a9213933b9db53c7eb8c11148da5300024e234983ae924de9d94
-  data.tar.gz: eeb94d72d083a0819a30f5af3029c8dbae5cede42fb5b166775f3100230756952e5147f250abed70269a75aaa81b21172fb6b5c325356f810a5b3678fc24fef3
+  metadata.gz: 796525af00e43eb89f3226108effe5bb41560cc8afe6c9b19e4680066eaf09e70eb517e406225a6bc2a1961f3d1b2216df66afc1f1f137fe5ed5fa61c44421e4
+  data.tar.gz: 2dc38dcfd71cfacf44eccc0640ddb11295b53e0bb5d43aeb447ceeb884174fb069b4d218fd0f3590134d0395f73a3529f5f8e0575084375d6b32cd85287dba7a

data/lib/danger/helpers/comment.rb

@@ -2,9 +2,10 @@ module Danger
   class Comment
     attr_reader :id, :body
 
-    def initialize(id, body)
+    def initialize(id, body, inline = nil)
       @id = id
       @body = body
+      @inline = inline
     end
 
     def self.from_github(comment)
@@ -13,9 +14,10 @@ module Danger
 
     def self.from_gitlab(comment)
       if comment.respond_to?(:id) && comment.respond_to?(:body)
-        self.new(comment.id, comment.body)
+        type = comment.respond_to?(:type) ? comment.type : nil
+        self.new(comment.id, comment.body, type == "DiffNote")
       else
-        self.new(comment["id"], comment["body"])
+        self.new(comment["id"], comment["body"], comment["type"] == "DiffNote")
       end
     end
 
@@ -24,7 +26,7 @@ module Danger
     end
 
     def inline?
-      body.include?("")
+      @inline.nil? ? body.include?("") : @inline
     end
   end
 end

data/lib/danger/request_sources/gitlab.rb

@@ -74,7 +74,7 @@ module Danger
         # @comments contains Comment objects (that have less information)
         @comments ||= begin
           if supports_inline_comments
-            @raw_comments = client.merge_request_discussions(ci_source.repo_slug, ci_source.pull_request_id)
+            @raw_comments = mr_discussions
               .auto_paginate
               .flat_map { |discussion| discussion.notes.map { |note| note.merge({"discussion_id" => discussion.id}) } }
             @raw_comments
@@ -88,6 +88,10 @@ module Danger
         end
       end
 
+      def mr_discussions
+        @mr_discussions ||= client.merge_request_discussions(ci_source.repo_slug, ci_source.pull_request_id)
+      end
+
       def mr_diff
         @mr_diff ||= begin
           mr_changes
@@ -158,9 +162,11 @@ module Danger
       end
 
       def update_pull_request_with_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger", new_comment: false, remove_previous_comments: false)
-        editable_comments = mr_comments.select { |comment| comment.generated_by_danger?(danger_id) }
+        editable_regular_comments = mr_comments
+          .select { |comment| comment.generated_by_danger?(danger_id) }
+          .reject(&:inline?)
 
-        last_comment = editable_comments.last
+        last_comment = editable_regular_comments.last
         should_create_new_comment = new_comment || last_comment.nil? || remove_previous_comments
 
         previous_violations =
@@ -215,7 +221,6 @@ module Danger
               client.edit_merge_request_note(ci_source.repo_slug, ci_source.pull_request_id, last_comment.id, body)
             end
         end
-        
       end
 
       def update_pull_request_without_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger", new_comment: false, remove_previous_comments: false)
@@ -323,9 +328,10 @@ module Danger
       end
 
       def submit_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: [], danger_id: "danger")
-        comments = client.merge_request_discussions(ci_source.repo_slug, ci_source.pull_request_id)
+        comments = mr_discussions
           .auto_paginate
           .flat_map { |discussion| discussion.notes.map { |note| note.merge({"discussion_id" => discussion.id}) } }
+          .select { |comment| Comment.from_gitlab(comment).inline? }
 
         danger_comments = comments.select { |comment| Comment.from_gitlab(comment).generated_by_danger?(danger_id) }
         non_danger_comments = comments - danger_comments
@@ -343,7 +349,7 @@ module Danger
           violation = violations_from_table(comment["body"]).first
           if !violation.nil? && violation.sticky
             body = generate_inline_comment_body("white_check_mark", violation, danger_id: danger_id, resolved: true, template: "gitlab")
-            client.update_merge_request_discussion_note(ci_source.repo_slug, ci_source.pull_request_id, comment["discussion_id"], comment["id"], body)
+            client.update_merge_request_discussion_note(ci_source.repo_slug, ci_source.pull_request_id, comment["discussion_id"], comment["id"], body: body)
           else
             # We remove non-sticky violations that have no replies
             # Since there's no direct concept of a reply in GH, we simply consider
@@ -400,12 +406,17 @@ module Danger
           end
 
           if matching_comments.empty?
+            old_position = find_old_position_in_diff mr_changes.changes, m
+            next false if old_position.nil?
+
             params = {
               body: body,
               position: {
                 position_type: 'text',
                 new_path: m.file,
                 new_line: m.line,
+                old_path: old_position[:path],
+                old_line: old_position[:line],
                 base_sha: self.mr_json.diff_refs.base_sha,
                 start_sha: self.mr_json.diff_refs.start_sha,
                 head_sha: self.mr_json.diff_refs.head_sha
@@ -426,11 +437,11 @@ module Danger
             # Update the comment to remove the strikethrough if present
             comment = matching_comments.first
             begin
-              client.update_merge_request_discussion_note(ci_source.repo_slug, ci_source.pull_request_id, comment["discussion_id"], comment["id"], body)
+              client.update_merge_request_discussion_note(ci_source.repo_slug, ci_source.pull_request_id, comment["discussion_id"], comment["id"], body: body)
             rescue Gitlab::Error::Error => e
               message = [e, "body: #{body}"].join("\n")
               puts message
-              
+
               next false
             end
           end
@@ -440,6 +451,58 @@ module Danger
         end
       end
 
+      def find_old_position_in_diff(changes, message)
+        range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
+
+        change = changes.find { |c| c["new_path"] == message.file }
+
+        # If there is no changes or rename only or deleted, return nil.
+        return nil if change.nil? || change["diff"].empty? || change["deleted_file"]
+
+        modified_position = {
+          path: change["old_path"],
+          line: nil
+        }
+
+        # If the file is new one, old line number must be nil.
+        return modified_position if change["new_file"]
+
+        current_old_line = 0
+        current_new_line = 0
+
+        change["diff"].each_line do |line|
+          match = line.match range_header_regexp
+
+          if match
+            # If the message line is at before next diffs, break from loop.
+            break if message.line.to_i < match[:new].to_i
+
+            # The match [:old] line does not appear yet at the header position, so reduce line number.
+            current_old_line = match[:old].to_i - 1
+            current_new_line = match[:new].to_i - 1
+            next
+          end
+
+          if line.start_with?("-")
+            current_old_line += 1
+          elsif line.start_with?("+")
+            current_new_line += 1
+            # If the message line starts with '+', old line number must be nil.
+            return modified_position if current_new_line == message.line.to_i
+          elsif !line.eql?("\\n")
+            current_old_line += 1
+            current_new_line += 1
+            # If the message line doesn't start with '+', old line number must be specified.
+            break if current_new_line == message.line.to_i
+          end
+        end
+
+        {
+          path: change["old_path"],
+          line: current_old_line - current_new_line + message.line.to_i
+        }
+      end
     end
   end
 end
+

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.0.4".freeze
+  VERSION = "6.0.5".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide