danger-swiftlint 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482dc2edd6a4f700400f2c4d09462df5228f0ab2a3d61a17eea5a552a78cd241
-  data.tar.gz: 9bdb741852c40ac8d268334190f413d01f9d17613ec718b989292664dbcb317c
+  metadata.gz: e924931c31832ddb5a46cca1f501df6f47bb54e72d6f4b3fb431b635ace4eded
+  data.tar.gz: c59d277064b596613540fdbf37667a89898d3ee87c0d81a4915400ecb034a14c
 SHA512:
-  metadata.gz: 940f20bab43a72603c98afbe43199556fd006abcae65598e0eca8fc1b8631bef6666ed81dfbecdbe5ec6b483864881986b6f0a4999b26dac448c90703cf41cdc
-  data.tar.gz: 16c654ae13cae9bcd4bb339fa0e2020ea3f35ea9f16be1ee29e5cfb74acf12f84d48147bde9f4eaa782e3842c851b9b4cfb83ec89a0678ab0e93537f0cbb3648
+  metadata.gz: 50813eedf382a9fbbb6659f5a1a90a8a563d7a3d14588d0050b4ccc47159e9f1fd1b0a093c829789572fa5e7e4ec53f841a262fb1ebd95b901d3358ab12c2907
+  data.tar.gz: e8a27dd4c356f6f6a99158a818bf6265bc505c91e782b7a7b0d6c48ab8e8ca7b878f39d584836d545fa1bbc12e090ee5ccc78fcc1c23ded9c5bb5e5c52e4c40b

data/lib/danger_plugin.rb

@@ -354,8 +354,7 @@ module Danger
     def git_modified_lines(file)
       git_range_info_line_regex = /^@@ .+\+(?<line_number>\d+),/ 
       git_modified_line_regex = /^\+(?!\+|\+)/
-      git_removed_line_regex = /^[-]/
-      git_not_removed_line_regex = /^[^-]/
+      git_removed_line_regex = /^\-(?!\-|\-)/
       file_info = git.diff_for_file(file)
       line_number = 0
       lines = []
@@ -367,7 +366,7 @@ module Danger
           when git_modified_line_regex
               lines << line_number
           end
-          line_number += 1 if line_number > 0
+          line_number += 1 if line_number > 0 && !git_removed_line_regex.match?(line)
           line_number = starting_line_number if line_number == 0 && starting_line_number > 0
       end
       lines

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.24.2'
+  VERSION = '0.24.3'
   SWIFTLINT_VERSION = '0.39.1'
 end

data/spec/danger_plugin_spec.rb

@@ -419,7 +419,8 @@ module Danger
           allow(@swiftlint.git.diff_for_file).to receive(:patch).and_return(git_diff)
           modified_lines = @swiftlint.git_modified_lines("spec/fixtures/SwiftFile.swift")
           expect(modified_lines).to_not be_empty
-          expect(modified_lines.length).to eql(23)
+          expect(modified_lines.length).to eql(24)
+          expect(modified_lines).to eql([15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 42])
         end
 
         it 'Get git modified files info' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger