diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-29 20:54:57 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-29 20:54:57 -0700 |
| commit | f09ae8538f3625468ee175d5a4d9782e0d5ba415 (patch) | |
| tree | 3ecf2b0f15ecf191b8fc413a7c280b6876f8f0d3 /railties/lib | |
| parent | 12e5c727aea3975d2108a66571dc13a5b2a0e651 (diff) | |
| parent | 2f71d4063f17e25310939f81246ada0accff0342 (diff) | |
| download | rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.tar.gz rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.tar.bz2 rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.zip | |
Merge pull request #6519 from oscardelben/3-2-stable
Display annotations in coffee files
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/source_annotation_extractor.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb index 2286e0477a..2e5f148862 100644 --- a/railties/lib/rails/source_annotation_extractor.rb +++ b/railties/lib/rails/source_annotation_extractor.rb @@ -53,7 +53,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+, +.erb+, +.haml+ and +.slim+ + # those with extension +.builder+, +.rb+, +.erb+, +.haml+, +.slim+ and +.coffee+ # are taken into account. def find_in(dir) results = {} @@ -63,7 +63,7 @@ class SourceAnnotationExtractor if File.directory?(item) results.update(find_in(item)) - elsif item =~ /\.(builder|rb)$/ + elsif item =~ /\.(builder|rb|coffee)$/ results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/)) elsif item =~ /\.erb$/ results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)) |