carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-02 22:02:51 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch custom error stream output to diagnostic (#4846)

Browse Source 
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:
Jon Ross-Perkins
2025-01-30 01:58:07 +00:00
committed by GitHub
co-authored by Chandler Carruth
parent 7d2958ad37
commit 7befe2ce9f
57 changed files with 379 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/testing/file_test.cpp
+7 -8
View File
@@ -104,10 +104,6 @@ auto ToolchainFileTest::Run(
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem>& fs,
FILE* input_stream, llvm::raw_pwrite_stream& output_stream,
llvm::raw_pwrite_stream& error_stream) -> ErrorOr<RunResult> {
if (component_ == "language_server" && !input_stream) {
return Error("language_server tests must provide STDIN");
}
CARBON_ASSIGN_OR_RETURN(auto prelude, installation_.ReadPreludeManifest());
if (!is_no_prelude()) {
for (const auto& file : prelude) {
@@ -147,14 +143,17 @@ auto ToolchainFileTest::Run(
}
auto ToolchainFileTest::GetDefaultArgs() -> llvm::SmallVector<std::string> {
llvm::SmallVector<std::string> args = {"--include-diagnostic-kind"};
if (component_ == "format") {
return {"format", "%s"};
args.insert(args.end(), {"format", "%s"});
return args;
} else if (component_ == "language_server") {
return {"language-server"};
args.insert(args.end(), {"language-server"});
return args;
}
llvm::SmallVector<std::string> args = {"compile", "--include-diagnostic-kind",
"--phase=" + component_.str()};
args.insert(args.end(), {"compile", "--phase=" + component_.str()});
if (component_ == "lex") {
args.insert(args.end(), {"--dump-tokens", "--omit-file-boundary-tokens"});