Add proper handling of if/elsif/else blocks.

Author: ioquatix

lib/rubocop/socketry/layout/consistent_blank_line_indentation.rb

@@ -52,7 +52,7 @@ def on_new_investigation
 
 					processed_source.lines.each_with_index do |line, index|
 						line_number = index + 1
-
+						
 						unless delta = indentation_deltas[line_number]
 							# Skip this line (e.g., non-squiggly heredoc content):
 							next
@@ -97,11 +97,20 @@ def walk_ast_for_indentation(node, deltas)
 					return unless node.is_a?(Parser::AST::Node)
 
 					case node.type
-					when :block, :hash, :array, :class, :module, :sclass, :def, :defs, :if, :case, :while, :until, :for, :kwbegin
+					when :block, :hash, :array, :class, :module, :sclass, :def, :defs, :case, :while, :until, :for, :kwbegin
+						
 						if location = node.location
 							deltas[location.line] += 1
 							deltas[location.last_line] -= 1
 						end
+					when :if
+						# We don't want to add deltas for elsif, because it's handled by the if node:
+						if node.keyword == "if"
+							if location = node.location
+								deltas[location.line] += 1
+								deltas[location.last_line] -= 1
+							end
+						end
 					when :dstr
 						if location = node.location
 							if location.is_a?(Parser::Source::Map::Heredoc) and body = location.heredoc_body

test/rubocop/socketry/layout/consistent_blank_line_indentation.rb

@@ -377,7 +377,7 @@
 			expect(offenses).to be(:empty?)
 		end
 	end
-
+	
 	with "a heredoc with correct body indentation" do
 		let(:source) {"def foo\n\tputs <<~FOO\n\t\tHello\n\t\tWorld\n\tFOO\nend\n"}
 		it "does not register an offense for properly indented heredoc body" do
@@ -388,7 +388,7 @@
 			expect(offenses).to be(:empty?)
 		end
 	end
-
+	
 	with "a heredoc with incorrect body indentation" do
 		let(:source) {"def foo\n\tputs <<~FOO\n\n\t\tHello World\n\tFOO\nend\n"}
 		it "registers an offense for unindented heredoc body" do
@@ -399,7 +399,7 @@
 			expect(offenses).not.to be(:empty?)
 		end
 	end
-
+	
 	with "a non-squiggly heredoc with any indentation" do
 		let(:source) {"def foo\n\tputs <<-FOO\n\t\tHello\n\t\tWorld\n\tFOO\nend\n"}
 		it "does not register an offense for non-squiggly heredoc content" do
@@ -410,7 +410,7 @@
 			expect(offenses).to be(:empty?)
 		end
 	end
-
+	
 	with "a plain heredoc with any indentation" do
 		let(:source) {"def foo\n\tputs <<FOO\n\t\tHello\n\t\tWorld\n\tFOO\nend\n"}
 		it "does not register an offense for plain heredoc content" do
@@ -421,7 +421,7 @@
 			expect(offenses).to be(:empty?)
 		end
 	end
-
+	
 	with "an interpolated string" do
 		let(:source) {"def foo\n\tname = 'world'\n\tputs \"Hello \#{name}\"\n\t\n\tputs 'done'\nend\n"}
 		it "does not interfere with blank line indentation for interpolated strings" do
@@ -432,4 +432,26 @@
 			expect(offenses).to be(:empty?)
 		end
 	end
+	
+		with "a blank line in if/elsif/else clauses with proper indentation" do
+		let(:source) {"if foo\n\t\n\tputs 'foo'\nelsif bar\n\t\n\tputs 'bar'\nelse\n\t\n\tputs 'else'\nend\n"}
+		it "does not register an offense when blank lines are properly indented" do
+			processed_source = RuboCop::ProcessedSource.new(source, RUBY_VERSION.to_f)
+			investigator = RuboCop::Cop::Commissioner.new([cop], [], raise_error: true)
+			report = investigator.investigate(processed_source)
+			offenses = report.offenses
+			expect(offenses).to be(:empty?)
+		end
+	end
+
+	with "a blank line in if/elsif/else clauses with incorrect indentation" do
+		let(:source) {"if foo\n\t\n\tputs 'foo'\nelsif bar\n\t\t\n\tputs 'bar'\nelse\n\t\n\tputs 'else'\nend\n"}
+		it "registers an offense when blank line in elsif is over-indented" do
+			processed_source = RuboCop::ProcessedSource.new(source, RUBY_VERSION.to_f)
+			investigator = RuboCop::Cop::Commissioner.new([cop], [], raise_error: true)
+			report = investigator.investigate(processed_source)
+			offenses = report.offenses
+			expect(offenses).not.to be(:empty?)
+		end
+	end
 end