Commit 2a073c8f by Akira Matsuda

"shadowing outer local variable - file"

parent 692f5faf
...@@ -418,8 +418,8 @@ module AnnotateModels ...@@ -418,8 +418,8 @@ module AnnotateModels
unless options[exclusion_key] unless options[exclusion_key]
did_annotate = self.get_patterns(key). did_annotate = self.get_patterns(key).
map { |file| resolve_filename(file, model_name, table_name) }. map { |f| resolve_filename(f, model_name, table_name) }.
map { |file| annotate_one_file(file, info, position_key, options_with_position(options, position_key)) }. map { |f| annotate_one_file(f, info, position_key, options_with_position(options, position_key)) }.
detect { |result| result } || did_annotate detect { |result| result } || did_annotate
end end
end end
...@@ -567,10 +567,10 @@ module AnnotateModels ...@@ -567,10 +567,10 @@ module AnnotateModels
deannotated_klass = true if(remove_annotation_of_file(model_file_name)) deannotated_klass = true if(remove_annotation_of_file(model_file_name))
get_patterns. get_patterns.
map { |file| resolve_filename(file, model_name, table_name) }. map { |f| resolve_filename(f, model_name, table_name) }.
each do |file| each do |f|
if File.exist?(file) if File.exist?(f)
remove_annotation_of_file(file) remove_annotation_of_file(f)
deannotated_klass = true deannotated_klass = true
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment