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

Add stdin to driver's streams, and refactor stream passing (#4812)

Browse Source 
The language server needs stdin, and for tests we should be passing it
around. My intent is to pass in a faux stdin to Driver for language
server tests.

As long as I'm adding a new parameter, I was looking at also changing
the way streams are passed in to Driver for style (pointers since
they're held past construction lifetime). Since these are all stored in
DriverEnv, I thought it might be a net improvement to use the struct
directly, getting more explicit parameter names and also removing the
need for `SetFuzzing`.

I'm trying here to avoid functional changes, but there are a couple
additional fixes like removing an obsolete `find_insensitive` and
refactoring how `ValidateOptions` handles errors (because it reduces the
number of spots that operate on error_stream).
This commit is contained in:
Jon Ross-Perkins
2025-01-21 16:52:05 +00:00
committed by GitHub
parent 41b6bb5688
commit 4f024410f7
19 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/driver/language_server_subcommand.cpp
+9 -4
View File
@@ -19,11 +19,16 @@ LanguageServerSubcommand::LanguageServerSubcommand()
: DriverSubcommand(SubcommandInfo) {}
auto LanguageServerSubcommand::Run(DriverEnv& driver_env) -> DriverResult {
// TODO: Consider a way to override stdin, but it's a `FILE*` so less
// convenient to work with.
auto err = LanguageServer::Run(stdin, driver_env.output_stream);
if (!driver_env.input_stream) {
*driver_env.error_stream
<< "error: language-server requires input_stream\n";
}
auto err =
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";
*driver_env.error_stream << "error: " << err.error() << "\n";
}
return {.success = err.ok()};
}