mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Switch custom error stream output to diagnostic (#4846)
This switches most error printing to use diagnostics instead of direct stream writes, even when not a specific file diagnostic. I'm allowing empty filenames for this use-case. This allows a little more specific testing to validate coverage of output using the diagnostic coverage test. I'm adding a few tests to cover things that weren't previously tested. Separately, this also forces a little more standardization in format... considering how changes like #4568 show effort being spent to _mirror_ diagnostic style, my thought is now to just use diagnostic code where possible. Note this also allows incrementally better testing of the language server; I'm changing the crash fix from #4847 in favor of diagnostic testing. --------- Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
This commit is contained in:
co-authored by
Chandler Carruth
parent
7d2958ad37
commit
7befe2ce9f
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "toolchain/driver/language_server_subcommand.h"
|
||||
|
||||
#include "toolchain/diagnostics/diagnostic_consumer.h"
|
||||
#include "toolchain/language_server/language_server.h"
|
||||
|
||||
namespace Carbon {
|
||||
@@ -20,18 +21,16 @@ LanguageServerSubcommand::LanguageServerSubcommand()
|
||||
|
||||
auto LanguageServerSubcommand::Run(DriverEnv& driver_env) -> DriverResult {
|
||||
if (!driver_env.input_stream) {
|
||||
*driver_env.error_stream
|
||||
<< "error: language-server requires input_stream\n";
|
||||
CARBON_DIAGNOSTIC(LanguageServerMissingInputStream, Error,
|
||||
"language-server requires input_stream");
|
||||
driver_env.emitter.Emit(LanguageServerMissingInputStream);
|
||||
return {.success = false};
|
||||
}
|
||||
|
||||
auto err =
|
||||
bool success =
|
||||
LanguageServer::Run(driver_env.input_stream, *driver_env.output_stream,
|
||||
*driver_env.error_stream);
|
||||
if (!err.ok()) {
|
||||
*driver_env.error_stream << "error: " << err.error() << "\n";
|
||||
}
|
||||
return {.success = err.ok()};
|
||||
*driver_env.error_stream, driver_env.consumer);
|
||||
return {.success = success};
|
||||
}
|
||||
|
||||
} // namespace Carbon
|
||||
|
||||
Reference in New Issue
Block a user