Merge pull request #3866 from ugisozols/master

Remove .rxml, .rjs and .rhtml from source annotation regexp.

1 files changed, 5 insertions, 5 deletions

diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index 1eed763aa3..a9f2180196 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -30,7 +30,7 @@ class SourceAnnotationExtractor
 
   # Prints all annotations with tag +tag+ under the root directories +app+, +config+, +lib+,
   # +script+, and +test+ (recursively). Only filenames with extension 
-  # +.builder+, +.rb+, +.rxml+, +.rhtml+, or +.erb+ are taken into account. The +options+
+  # +.builder+, +.rb+, and +.erb+ are taken into account. The +options+
   # hash is passed to each annotation's +to_s+.
   #
   # This class method is the single entry point for the rake tasks.
@@ -47,7 +47,7 @@ class SourceAnnotationExtractor
 
   # Returns a hash that maps filenames under +dirs+ (recursively) to arrays
   # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, +.rxml+, +.rhtml+, and +.erb+
+  # those with extension +.builder+, +.rb+, and +.erb+
   # are taken into account.
   def find(dirs=%w(app config lib script test))
     dirs.inject({}) { |h, dir| h.update(find_in(dir)) }
@@ -55,7 +55,7 @@ class SourceAnnotationExtractor
 
   # Returns a hash that maps filenames under +dir+ (recursively) to arrays
   # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, +.rxml+, +.rhtml+, and +.erb+
+  # those with extension +.builder+, +.rb+, and +.erb+
   # are taken into account.
   def find_in(dir)
     results = {}
@@ -65,9 +65,9 @@ class SourceAnnotationExtractor
 
       if File.directory?(item)
         results.update(find_in(item))
-      elsif item =~ /\.(builder|(r(?:b|xml|js)))$/
+      elsif item =~ /\.(builder|rb)$/
         results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
-      elsif item =~ /\.(rhtml|erb)$/
+      elsif item =~ /\.erb$/
         results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
       end
     end