decode 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd2b15f3019877bc34174d6d75e65d435431d6b4642fe6806c01cb44a154d20
-  data.tar.gz: 99d6be44ed79584ba17a8ed8479c976890aac2a621d4be6ac0f0ab3edef86c9f
+  metadata.gz: 0ae94375f9288ad2aa541ed744d7fb51b86da0bb83d77a019e17c6c31ac9f2cf
+  data.tar.gz: 74e3bfe6b181464eb8406ba684aee902b5519ae48d960f9e2bb6a79fffe1917d
 SHA512:
-  metadata.gz: 6015f4796c39f6c187fdf42fc872da64d85f4472ed1a641c74255a6a39c5cf411b30e31d55eabb8211c09d0d04030eabc23e1cd850d6ecdb92c50e9c72e25388
-  data.tar.gz: 32bb1229c0b4dca21f0334b13c2742dc3b5963f8252da77377b2687322ee94c60b8a2b313df410e113f1865bd48b65be05b3756f968de77de27d238d54001f27
+  metadata.gz: '089969a2909633681778781ef8047e262cc4f4405f04a2adb72dbeb73f818fa8a6a4f177573fa4077eee1a9892b4995dc24cbff2dc46aacd0343422af5a16df8'
+  data.tar.gz: 8d9133f1d02b98af77c6bbd3fbf26c93d01c9be4614eedefc6e4c731aa077103dda30a484a6ac0ddbbbc45b3fce76c3c5d49559a3563b09dfba29723fc38ace5

data/lib/decode/language/ruby/definition.rb

@@ -43,19 +43,22 @@ module Decode
 				end
 				
 				# The source code associated with the definition.
-				# @returns [String] The source code text for this definition.
+				# @returns [String]
 				def text
-					expression = @node.location
-					lines = expression.slice.lines
+					location = @node.location
+					source_text = location.slice_lines
+					lines = source_text.split("\n")
+					
 					if lines.count == 1
 						return lines.first
 					else
-						if indentation = expression.slice.lines.first[/\A\s+/]
-							# Remove all the indentation:
+						# Get the indentation from the first line of the node in the original source
+						if indentation = source_text[/\A\s+/]
+							# Remove the base indentation from all lines
 							lines.each{|line| line.sub!(indentation, "")}
 						end
 						
-						return lines.join
+						return lines.join("\n")
 					end
 				end
 				

data/lib/decode/language/ruby/parser.rb

@@ -49,7 +49,7 @@ module Decode
 				def walk_definitions(node, parent = nil, source = nil, &block)
 					# Check for scope definitions from comments
 					if node.comments.any?
-						parent = scope_for(node.comments.map(&:slice), parent, &block) || parent
+						parent = scope_for(comments_for(node), parent, &block) || parent
 					end
 					
 					case node.type
@@ -72,7 +72,7 @@ module Decode
 						
 						definition = Module.new(path,
 							visibility: :public,
-							comments: node.comments.map(&:slice),
+							comments: comments_for(node),
 							parent: parent,
 							node: node,
 							language: @language,
@@ -94,7 +94,7 @@ module Decode
 						definition = Class.new(path,
 							super_class: super_class,
 							visibility: :public, 
-							comments: node.comments.map(&:slice),
+							comments: comments_for(node),
 							parent: parent,
 							node: node,
 							language: @language,
@@ -112,7 +112,7 @@ module Decode
 					when :singleton_class_node
 						if name = singleton_name_for(node)
 							definition = Singleton.new(name,
-								comments: node.comments.map(&:slice),
+								comments: comments_for(node),
 								parent: parent, language: @language, visibility: :public, source: source
 							)
 							
@@ -127,7 +127,7 @@ module Decode
 						
 						definition = Method.new(node.name,
 							visibility: @visibility,
-							comments: node.comments.map(&:slice),
+							comments: comments_for(node),
 							parent: parent,
 							node: node,
 							language: @language,
@@ -138,7 +138,7 @@ module Decode
 						yield definition
 					when :constant_write_node
 						definition = Constant.new(node.name,
-							comments: node.comments.map(&:slice),
+							comments: comments_for(node),
 							parent: parent,
 							node: node,
 							language: @language,
@@ -162,7 +162,7 @@ module Decode
 										
 										definition = Method.new(arg_node.name,
 											visibility: name,
-											comments: arg_node.comments.map(&:slice),
+											comments: comments_for(arg_node),
 											parent: parent,
 											node: arg_node,
 											language: @language,
@@ -191,7 +191,7 @@ module Decode
 							end
 						when :attr, :attr_reader, :attr_writer, :attr_accessor
 							definition = Attribute.new(attribute_name_for(node),
-								comments: node.comments.map(&:slice),
+								comments: comments_for(node),
 								parent: parent, language: @language, node: node
 							)
 							
@@ -207,7 +207,7 @@ module Decode
 								old_name = symbol_name_for(old_name_arg)
 								
 								definition = Alias.new(new_name.to_sym, old_name.to_sym,
-									comments: node.comments.map(&:slice),
+									comments: comments_for(node),
 									parent: parent,
 									node: node,
 									language: @language,
@@ -220,14 +220,14 @@ module Decode
 						else
 							# Check if this call should be treated as a definition
 							# either because it has a @name comment, @attribute comment, or a block
-							has_name_comment = node.comments.any? { |comment| comment.slice.match(NAME_ATTRIBUTE) }
-							has_attribute_comment = kind_for(node, node.comments.map(&:slice))
+							has_name_comment = comments_for(node).any? { |comment| comment.match(NAME_ATTRIBUTE) }
+							has_attribute_comment = kind_for(node, comments_for(node))
 							has_block = node.block
 							
 							if has_name_comment || has_attribute_comment || has_block
 								definition = Call.new(
 									attribute_name_for(node),
-									comments: node.comments.map(&:slice),
+									comments: comments_for(node),
 									parent: parent, language: @language, node: node
 								)
 								
@@ -245,7 +245,7 @@ module Decode
 						old_name = node.old_name.unescaped
 						
 						definition = Alias.new(new_name.to_sym, old_name.to_sym,
-							comments: node.comments.map(&:slice),
+							comments: comments_for(node),
 							parent: parent,
 							node: node,
 							language: @language,
@@ -279,6 +279,42 @@ module Decode
 				
 				private
 				
+				# Extract clean comment text from a node by removing leading # symbols and whitespace.
+				# Only returns comments that directly precede the node (i.e., are adjacent to it).
+				# @parameter node [Node] The AST node with comments.
+				# @returns [Array] Array of cleaned comment strings.
+				def comments_for(node)
+					# Find the node's starting line
+					node_start_line = node.location.start_line
+					
+					# Filter comments to only include those that directly precede the node
+					# We work backwards from the line before the node to find consecutive comments
+					adjacent_comments = []
+					expected_line = node_start_line - 1
+					
+					# Process comments in reverse order to work backwards from the node
+					node.comments.reverse_each do |comment|
+						comment_line = comment.location.start_line
+						
+						# If this comment is on the expected line, it's adjacent
+						if comment_line == expected_line
+							adjacent_comments.unshift(comment)
+							expected_line = comment_line - 1
+						elsif comment_line < expected_line
+							# If we hit a comment that's too far back, stop
+							break
+						end
+						# If comment_line > expected_line, skip it (it's not adjacent)
+					end
+					
+					# Clean and return the adjacent comments
+					adjacent_comments.map do |comment|
+						text = comment.slice
+						# Remove leading # and optional whitespace
+						text.sub(/\A\#\s?/, "")
+					end
+				end
+				
 				def assign_definition(parent, definition)
 					(@definitions[parent] ||= {})[definition.name] = definition
 				end
@@ -301,32 +337,6 @@ module Decode
 					end
 				end
 				
-				def extract_comments_for(node, comments)
-					prefix = []
-					
-					while comment = comments.first
-						break if comment.location.line >= node.location.line
-						
-						if last_comment = prefix.last
-							if last_comment.location.line != (comment.location.line - 1)
-								prefix.clear
-							end
-						end
-						
-						prefix << comments.shift
-					end
-					
-					# The last comment must butt up against the node:
-					if comment = prefix.last
-						if comment.location.line == (node.location.line - 1)
-							return prefix.map do |comment|
-								# Remove # and at most one space/tab to preserve indentation
-								comment.slice.sub(/\A\#[\s\t]?/, "")
-							end
-						end
-					end
-				end
-				
 				def with_visibility(visibility = :public, &block)
 					saved_visibility = @visibility
 					@visibility = visibility
@@ -335,12 +345,11 @@ module Decode
 					@visibility = saved_visibility
 				end
 				
-				NAME_ATTRIBUTE = /\A\#\s*@name\s+(?<value>.*?)\Z/
+				NAME_ATTRIBUTE = /\A@name\s+(?<value>.*?)\Z/
 				
 				def attribute_name_for(node)
-					node.comments.each do |comment|
-						text = comment.slice
-						if match = text.match(NAME_ATTRIBUTE)
+					comments_for(node).each do |comment|
+						if match = comment.match(NAME_ATTRIBUTE)
 							return match[:value].to_sym
 						end
 					end
@@ -410,8 +419,8 @@ module Decode
 				end
 				
 				KIND_ATTRIBUTE = /\A
-					(\#\s*@(?<kind>attribute)\s+(?<value>.*?))|
-					(\#\s*@define\s+(?<kind>)\s+(?<value>.*?))
+					(@(?<kind>attribute)\s+(?<value>.*?))|
+					(@define\s+(?<kind>)\s+(?<value>.*?))
 				\Z/x
 				
 				def kind_for(node, comments = nil)
@@ -425,7 +434,7 @@ module Decode
 				end
 				
 				SCOPE_ATTRIBUTE = /\A
-					\#\s*@scope\s+(?<names>.*?)
+					@scope\s+(?<names>.*?)
 				\Z/x
 				
 				def scope_for(comments, parent = nil, &block)

data/lib/decode/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2020-2024, by Samuel Williams.
 
 module Decode
-	VERSION = "0.23.0"
+	VERSION = "0.23.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decode
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Samuel Williams