pronto-clang_format 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 061f4e0d3a49949b184702e1c1e4ab65193d95f114f004fa8b2281d0ed48c37f
-  data.tar.gz: dfbc0137ae30578e7581b4157e006931209d0ace485702a6d31640c1403aa3fe
+  metadata.gz: 9fe7b8b5605c1b8f0412b956371ecad612216fcdaf2cddb8ea68c9436f346db3
+  data.tar.gz: 6b2e07eef94cf67d213d1cdeccd103d9eb4aabb9cd458138af1cee08a5cce3f4
 SHA512:
-  metadata.gz: a303e28f8c48abb8d1917c49385965aa65b629e155c3ec64b59d21093083de7a74b9b4508707548fb51e7bd3fc1976ce9958afcfc7d6d86acd16e1035c52f0f7
-  data.tar.gz: fe59355bb6206a4a114c5fb9e70db591774c821769def8a85038797f7633a896271ace94392b1f657bcb473f386ac9a7f96457290d0efd85aad5599ba188f37c
+  metadata.gz: a16d084a2da8626789f91b5691cc6236c2742afc51a67923a7989f341eb9344728a89cb08c7d010ad24627709d6209d7018d71f1b4fced8ac514f208b808ca12
+  data.tar.gz: ce6ef55cc378d4ffac01d9c2716c005729b38d03b7d1ddbb4ed13fa43bb0e962760302cc19ec503d8abf54aeea6b7d54f991a37b16295bf179e6cfecf42c33de

data/lib/pronto/clang_format/version.rb

@@ -1,5 +1,5 @@
 module Pronto
   module ClangFormat
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

data/lib/pronto/clang_format/wrapper.rb

@@ -57,9 +57,8 @@ module Pronto
           end_line_no, = ln_col_from_offset(newlines_array, offset + length)
           # extract relevant lines and pass to offence
           start_offset = offset_from_ln_col(newlines_array, line_no, 1)
-          end_offset = offset_from_ln_col(newlines_array, end_line_no + 1, 0)
-          old_lines_text = file_contents[start_offset..end_offset]
-                           .prepend("\n")
+          end_offset = offset_from_ln_col(newlines_array, end_line_no + 1, -1)
+          old_lines_text = "\n#{file_contents[start_offset..end_offset]}\n"
           Offence.new(offset, line_no, column, length, replacement,
                       old_lines_text)
         end
@@ -87,6 +86,8 @@ module Pronto
       #   newline_offsets_in(file_contents)
       # - offset: offset to be converted
       def offset_from_ln_col(newlines_array, ln, col)
+        # return -1 if the line does not exist in file
+        return -1 unless ln - 2 < newlines_array.length
         (ln >= 2 ? newlines_array[ln - 2] : -1) + col
       end
 

data/lib/pronto/clang_format_runner.rb

@@ -21,6 +21,7 @@ module Pronto
         .select { |p| valid_patch?(p) }
         .map { |p| inspect(p) }
         .flatten.compact
+        .uniq { |message| message.line } # generate only one message per line
     end
 
     def valid_patch?(patch)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pronto-clang_format
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Jabbour