diff --git a/src/lint/linter/ArcanistExternalLinter.php b/src/lint/linter/ArcanistExternalLinter.php index fc824036..bb907d57 100644 --- a/src/lint/linter/ArcanistExternalLinter.php +++ b/src/lint/linter/ArcanistExternalLinter.php @@ -267,34 +267,37 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter { if (!Filesystem::binaryExists($interpreter)) { throw new ArcanistUsageException( pht( - 'Unable to locate interpreter "%s" to run linter %s. You may '. - 'need to install the interpreter, or adjust your linter '. - 'configuration.'. - "\nTO INSTALL: %s", + 'Unable to locate interpreter "%s" to run linter %s. You may need '. + 'to install the interpreter, or adjust your linter configuration.', $interpreter, - get_class($this), - $this->getInstallInstructions())); + get_class($this))); } if (!Filesystem::pathExists($binary)) { throw new ArcanistUsageException( - pht( - 'Unable to locate script "%s" to run linter %s. You may need '. - 'to install the script, or adjust your linter configuration. '. - "\nTO INSTALL: %s", - $binary, - get_class($this), - $this->getInstallInstructions())); + sprintf( + "%s\n%s", + pht( + 'Unable to locate script "%s" to run linter %s. You may need '. + 'to install the script, or adjust your linter configuration.', + $binary, + get_class($this)), + pht( + 'TO INSTALL: %s', + $this->getInstallInstructions()))); } } else { if (!Filesystem::binaryExists($binary)) { throw new ArcanistUsageException( - pht( - 'Unable to locate binary "%s" to run linter %s. You may need '. - 'to install the binary, or adjust your linter configuration. '. - "\nTO INSTALL: %s", - $binary, - get_class($this), - $this->getInstallInstructions())); + sprintf( + "%s\n%s", + pht( + 'Unable to locate binary "%s" to run linter %s. You may need '. + 'to install the binary, or adjust your linter configuration.', + $binary, + get_class($this)), + pht( + 'TO INSTALL: %s', + $this->getInstallInstructions()))); } } } @@ -415,7 +418,11 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter { $future->resolvex(); } else { throw new Exception( - "Linter failed to parse output!\n\n{$stdout}\n\n{$stderr}"); + sprintf( + "%s\n\nSTDOUT\n%s\n\nSTDERR\n%s", + pht('Linter failed to parse output!'), + $stdout, + $stderr)); } }