Fix block delimiter spacing in do...end blocks.

Author: samuel-williams-shopify

lib/rubocop/socketry/layout/block_delimiter_spacing.rb

@@ -81,14 +81,28 @@ def lambda_or_proc?(send_node)
 
 				# Check if the block is part of an expression (not a top-level statement)
 				# Top-level statements are directly inside a :begin node (file/method body)
-				# and should have space. Everything else (expressions, nested blocks) should not.
+				# or inside do...end block bodies, and should have space.
+				# Everything else (expressions, nested arguments, etc.) should not have space.
 				def part_of_expression?(node)
 					parent = node.parent
 					return false unless parent
 
 					# If parent is a :begin node (sequence of statements), this is top-level
-					# Otherwise, it's part of an expression or nested context
-					parent.type != :begin
+					return false if parent.type == :begin
+					
+					# If parent is a :block node, check if it's a do...end block
+					# do...end blocks contain statements (no space)
+					# {...} blocks contain expressions (space required)
+					if parent.type == :block
+						# do...end blocks use keywords, {...} blocks use braces
+						return false unless parent.braces?
+					end
+					
+					# Check if we're in a :kwbegin node (begin...end block body)
+					return false if parent.type == :kwbegin
+					
+					# Otherwise, it's part of an expression (assignment, argument, etc.)
+					true
 				end
 
 				# Check that there's no space before the opening brace for lambdas

releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## Unreleased
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly distinguish between statement and expression contexts for blocks inside `do...end` blocks.
+
 ## v0.7.0
 
   - Fixed `Layout/BlockDelimiterSpacing` to correctly handle blocks inside `do...end` blocks (statements should have space before braces).

test/rubocop/socketry/layout/block_delimiter_spacing.rb

@@ -425,4 +425,42 @@
 			expect(offenses.first.message).to be(:include?, "Remove space")
 		end
 	end
+	
+	# Nested blocks inside do...end blocks
+	with "a braces block inside a do...end block" do
+		let(:source) do
+			<<~RUBY
+				foo do
+					bar {baz}
+				end
+			RUBY
+		end
+		
+		it "does not register an offense for standalone method call inside do...end" 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 braces block inside a do...end block without space" do
+		let(:source) do
+			<<~RUBY
+				foo do
+					bar{baz}
+				end
+			RUBY
+		end
+		
+		it "registers an offense for missing space before brace" 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?)
+			expect(offenses.first.message).to be(:include?, "Add a space")
+		end
+	end
 end