Fix Style/IfInsideElse offense

2 files changed, 11 insertions, 19 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a0260f2e..66d56f6d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -190,12 +190,6 @@ Style/HashEachMethods:
     - 'lib/axlsx/workbook/worksheet/rich_text_run.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowIfModifier.
-Style/IfInsideElse:
-  Exclude:
-    - 'lib/axlsx/stylesheet/styles.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
 
diff --git a/lib/axlsx/stylesheet/styles.rb b/lib/axlsx/stylesheet/styles.rb
index 625f6a02..a3428e27 100644
--- a/lib/axlsx/stylesheet/styles.rb
+++ b/lib/axlsx/stylesheet/styles.rb
@@ -390,24 +390,22 @@ module Axlsx
 
       if options[:border].nil?
         base_border_opts = {}
-      else
-        if options[:border].is_a?(Array)
-          borders_array += options[:border]
+      elsif options[:border].is_a?(Array)
+        borders_array += options[:border]
 
-          base_border_opts = {}
+        base_border_opts = {}
 
-          options[:border].each do |b_opts|
-            if b_opts[:edges].nil?
-              base_border_opts = base_border_opts.merge(b_opts)
-            end
+        options[:border].each do |b_opts|
+          if b_opts[:edges].nil?
+            base_border_opts = base_border_opts.merge(b_opts)
           end
-        else
-          borders_array << options[:border]
+        end
+      else
+        borders_array << options[:border]
 
-          base_border_opts = options[:border]
+        base_border_opts = options[:border]
 
-          validate_border_hash.call(base_border_opts)
-        end
+        validate_border_hash.call(base_border_opts)
       end
 
       Border::EDGES.each do |edge|