Skip to content

Commit 9c06800

Browse files
committed
Do not redirect language server stderr.
1 parent 9a316ef commit 9c06800

File tree

5 files changed

+1
-38
lines changed

5 files changed

+1
-38
lines changed

src/languageclient.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2440,15 +2440,12 @@ impl State {
24402440
})
24412441
.collect();
24422442

2443-
let stderr = logger::open(&get_logpath_server())?;
2444-
24452443
let process = std::process::Command::new(command
24462444
.get(0)
24472445
.ok_or_else(|| err_msg("Empty command!"))?)
24482446
.args(&command[1..])
24492447
.stdin(Stdio::piped())
24502448
.stdout(Stdio::piped())
2451-
.stderr(stderr)
24522449
.spawn()?;
24532450

24542451
let child_id = Some(process.id());

src/logger.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ fn create_config(path: &Option<String>, level: &LevelFilter) -> Result<Config> {
2626
Ok(config)
2727
}
2828

29-
pub fn open<P: AsRef<Path>>(path: P) -> Result<File> {
30-
let mut fo = std::fs::OpenOptions::new();
31-
let fo = fo.create(true).write(true).truncate(true);
32-
#[cfg(unix)]
33-
let fo = fo.mode(0o666);
34-
Ok(fo.open(path)?)
35-
}
36-
3729
pub fn init() -> Result<Handle> {
3830
let handle = log4rs::init_config(create_config(&None, &LevelFilter::Warn)?)?;
3931

src/main.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(non_snake_case, non_upper_case_globals, unknown_lints)]
22

3-
use std::borrow::Cow;
43
use std::collections::{HashMap, HashSet, VecDeque};
54
use std::convert::Into;
65
use std::env;
@@ -10,9 +9,6 @@ use std::io::prelude::*;
109
use std::io::{BufRead, BufReader, BufWriter};
1110
use std::net::TcpStream;
1211
use std::ops::Deref;
13-
#[allow(unused_imports)]
14-
#[cfg(unix)]
15-
use std::os::unix::fs::OpenOptionsExt;
1612
use std::path::{Path, PathBuf};
1713
use std::process::{ChildStdin, ChildStdout, Stdio};
1814
use std::str::FromStr;

src/utils.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,6 @@ impl<P: AsRef<Path> + std::fmt::Debug> ToUrl for P {
126126
}
127127
}
128128

129-
pub fn get_tmppath() -> PathBuf {
130-
// Ref: https://en.wikipedia.org/wiki/TMPDIR
131-
let dir: Cow<_> = env::var("TMPDIR")
132-
.or_else(|_| env::var("TMP"))
133-
.or_else(|_| env::var("TEMP"))
134-
.or_else(|_| env::var("TEMPDIR"))
135-
.map(|t| t.into())
136-
.unwrap_or_else(|_| "/tmp".into());
137-
138-
PathBuf::from(&*dir)
139-
}
140-
141-
pub fn get_logpath_server() -> PathBuf {
142-
get_tmppath().join("LanguageServer.log")
143-
}
144-
145129
pub fn apply_TextEdits(lines: &[String], edits: &[TextEdit]) -> Result<Vec<String>> {
146130
// Edits are ordered from bottom to top, from right to left.
147131
let mut edits_by_index = vec![];

src/vim.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,7 @@ pub fn loop_reader<T: BufRead>(
356356
if line.is_empty() {
357357
count_empty_lines += 1;
358358
if count_empty_lines > 5 {
359-
let mut message = "".to_string();
360-
if let Ok(log_server) = read_to_string(get_logpath_server()) {
361-
message += "\n\nlanguage server stderr:\n";
362-
message += &log_server;
363-
}
364-
365-
bail!("{}", message);
359+
bail!("Unable to read from language server");
366360
}
367361

368362
let mut buf = vec![0; content_length];

0 commit comments

Comments
 (0)