diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 92fbcb8d912c0..c3b687d66dcb2 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,17 @@ +* When encountering an Unrecognized Command Error, the developer will be given the option to + run of the suggested corrections instead. + + ```txt + bin/rails action_txt:install + Unrecognized command "action_txt:install" + + Did you mean? action_text:install [Yn] Y + Installing JavaScript dependencies + ... + ``` + + *Andrew Novoselac* + * Allow Actionable Errors encountered when running tests to be retried. This can be configured by `config.actionable_command_line_errors` and is `true` in the test environment unless the `"CI"` env variable is set, and false otherwise. diff --git a/railties/lib/rails/command.rb b/railties/lib/rails/command.rb index 92dcf6a125486..7e5feda3a0dfa 100644 --- a/railties/lib/rails/command.rb +++ b/railties/lib/rails/command.rb @@ -44,6 +44,21 @@ def initialize(name) end end + class UnrecognizedCommandCorrector < Thor::Shell::Basic + def correct(error) + if defined?(DidYouMean::Correctable) && defined?(DidYouMean::SpellChecker) + say error.original_message + + error.corrections.detect do |correction| + correction if yes? DidYouMean.formatter.message_for([correction]) + " [Yn]" + end + else + say error.detailed_message + nil + end + end + end + include Behavior HELP_MAPPINGS = %w(-h -? --help).to_set @@ -77,7 +92,8 @@ def invoke(full_namespace, args = [], **config) if error.name == full_namespace && command && command_name == full_namespace command.perform("help", [], config) else - puts error.detailed_message + correction = UnrecognizedCommandCorrector.new.correct(error) + return invoke(correction, args, **config) if correction end exit(1) end diff --git a/railties/test/command/help_integration_test.rb b/railties/test/command/help_integration_test.rb index aad929cd29864..80a442c0943d0 100644 --- a/railties/test/command/help_integration_test.rb +++ b/railties/test/command/help_integration_test.rb @@ -15,7 +15,7 @@ class Rails::Command::HelpIntegrationTest < ActiveSupport::TestCase output = rails "vershen", allow_failure: true assert_match %(Unrecognized command "vershen"), output - assert_match "Did you mean? version", output + assert_match "Did you mean? version [Yn]", output end test "loads Rake tasks only once on unrecognized command" do