diff options
author | Richard Schneeman <richard.schneeman@gmail.com> | 2015-02-23 09:48:48 -0600 |
---|---|---|
committer | Richard Schneeman <richard.schneeman@gmail.com> | 2015-02-23 09:48:48 -0600 |
commit | 98d896e0aede716ecf3918d54dfc78bad80d2878 (patch) | |
tree | c5939fb92cdd527d89c6c0adb391a68ccac3d79e /railties/lib | |
parent | 12afb78b1c2bf47a054290634e70fb8a0305c846 (diff) | |
parent | 7692a163fa836c7c66fe01a63215c1fd550f7b27 (diff) | |
download | rails-98d896e0aede716ecf3918d54dfc78bad80d2878.tar.gz rails-98d896e0aede716ecf3918d54dfc78bad80d2878.tar.bz2 rails-98d896e0aede716ecf3918d54dfc78bad80d2878.zip |
Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestions
Improve generator name suggestions a bit.
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index db8b184213..341291f08b 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -159,7 +159,7 @@ module Rails options = sorted_groups.flat_map(&:last) suggestions = options.sort_by {|suggested| levenshtein_distance(namespace.to_s, suggested) }.first(3) msg = "Could not find generator '#{namespace}'. " - msg << "Maybe you meant #{ suggestions.map {|s| "'#{s}'"}.join(" or ") }\n" + msg << "Maybe you meant #{ suggestions.map {|s| "'#{s}'"}.to_sentence(last_word_connector: " or ") }\n" msg << "Run `rails generate --help` for more options." puts msg end @@ -260,11 +260,9 @@ module Rails t = str2 n = s.length m = t.length - max = n/2 return m if (0 == n) return n if (0 == m) - return n if (n - m).abs > max d = (0..m).to_a x = nil |