Skip to content

Commit

Permalink
Revert option to provide server path
Browse files Browse the repository at this point in the history
  • Loading branch information
SofusA committed Sep 14, 2024
1 parent 3c3f05b commit 68661c0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ use roslyn_language_server::{
#[derive(Parser, Debug)]
#[command(author, version, about, long_about = None)]
struct Args {
/// Provide path for Microsoft.CodeAnalysis.LanguageServer.
/// Otherwise this will be downloaded to ~/.roslyn
#[arg(short, long)]
server_path: Option<String>,

/// Remove old versions of Microsoft.CodeAnalysis.LanguageServer
#[arg(short, long, default_value_t = true)]
remove_old_server_versions: bool,
Expand All @@ -31,7 +26,7 @@ async fn main() {
let args = Args::parse();
let version = SERVER_VERSION;

let pipe = start_roslyn(args.server_path, version, args.remove_old_server_versions).await;
let pipe = start_roslyn(version, args.remove_old_server_versions).await;

let (reader, mut writer) = tokio::io::split(pipe);

Expand Down
38 changes: 12 additions & 26 deletions src/roslyn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,25 @@ async fn parse_roslyn_response(reader: BufReader<ChildStdout>) -> Result<RoslynR
}
}

pub async fn start_roslyn(
server_path: Option<String>,
version: &str,
remove_old_server_versions: bool,
) -> Box<dyn PipeStream> {
pub async fn start_roslyn(version: &str, remove_old_server_versions: bool) -> Box<dyn PipeStream> {
let mut log_dir = home_dir().expect("Unable to find home directory");
log_dir.push(".roslyn");
log_dir.push("logs");

let mut process: Child;

if let Some(server_path) = server_path {
process = Command::new(server_path)
.arg("--logLevel=Information")
.arg("--extensionLogDirectory")
.arg(log_dir)
.stdout(Stdio::piped())
.spawn()
.expect("Failed to execute command");
} else {
let roslyn_dll = ensure_roslyn_is_installed(version, remove_old_server_versions)
.await
.expect("Unable to install Roslyn");
let roslyn_dll = ensure_roslyn_is_installed(version, remove_old_server_versions)
.await
.expect("Unable to install Roslyn");

process = Command::new("dotnet")
.arg(roslyn_dll)
.arg("--logLevel=Information")
.arg("--extensionLogDirectory")
.arg(log_dir)
.stdout(Stdio::piped())
.spawn()
.expect("Failed to execute command");
}
process = Command::new("dotnet")
.arg(roslyn_dll)
.arg("--logLevel=Information")
.arg("--extensionLogDirectory")
.arg(log_dir)
.stdout(Stdio::piped())
.spawn()
.expect("Failed to execute command");

let reader = BufReader::new(process.stdout.take().expect("Failed to capture stdout"));

Expand Down

0 comments on commit 68661c0

Please sign in to comment.