Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(lsp): Fail test if error logged to stderr [WIP] #23742

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −1
Open

chore(lsp): Fail test if error logged to stderr [WIP] #23742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 22 additions & 1 deletion tests/util/server/src/lsp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ impl LspClientBuilder {
pub fn new_with_dir(deno_dir: TempDir) -> Self {
Self {
print_stderr: false,
capture_stderr: false,
capture_stderr: true,
log_debug: false,
deno_exe: deno_exe_path(),
root_dir: deno_dir.path().clone(),
Expand Down Expand Up @@ -577,7 +577,9 @@ impl LspClientBuilder {
let stdin = child.stdin.take().unwrap();
let writer = io::BufWriter::new(stdin);

let error_on_stderr = Arc::new(std::sync::atomic::AtomicBool::new(false));
let stderr_lines_rx = if self.capture_stderr {
let error_on_stderr = error_on_stderr.clone();
let stderr = child.stderr.take().unwrap();
let print_stderr = self.print_stderr;
let (tx, rx) = mpsc::channel::<String>();
Expand All @@ -586,6 +588,11 @@ impl LspClientBuilder {
for line in stderr.lines() {
match line {
Ok(line) => {
if line.trim().contains("ERROR") || line.trim().contains("Error")
{
error_on_stderr
.store(true, std::sync::atomic::Ordering::SeqCst);
}
if print_stderr {
eprintln!("{}", line);
}
Expand Down Expand Up @@ -613,6 +620,7 @@ impl LspClientBuilder {
stderr_lines_rx,
config: json!("{}"),
supports_workspace_configuration: false,
error_on_stderr,
})
}
}
Expand All @@ -628,6 +636,7 @@ pub struct LspClient {
stderr_lines_rx: Option<mpsc::Receiver<String>>,
config: serde_json::Value,
supports_workspace_configuration: bool,
error_on_stderr: Arc<std::sync::atomic::AtomicBool>,
}

impl Drop for LspClient {
Expand All @@ -636,6 +645,18 @@ impl Drop for LspClient {
Ok(None) => {
self.child.kill().unwrap();
let _ = self.child.wait();
if self
.error_on_stderr
.load(std::sync::atomic::Ordering::SeqCst)
{
eprintln!("==== STDERR OUTPUT ====");
while let Ok(line) = self.stderr_lines_rx.as_ref().unwrap().try_recv()
{
eprintln!("{}", line)
}
eprintln!("== END STDERR OUTPUT ==");
panic!("deno lsp emitted errors");
}
}
Ok(Some(status)) => panic!("deno lsp exited unexpectedly {status}"),
Err(e) => panic!("pebble error: {e}"),
Expand Down