Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-18 23:59:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

add detection for integrated cli, verify

Browse Source
This commit is contained in:
Connor Peet
2022-09-26 07:22:58 +02:00
parent 07453efc00
commit 889fbd2f1b
10 changed files with 52 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/src/bin/code/main.rs
View File

@@ -14,6 +14,7 @@ use cli::{
update_service::UpdateService,
util::{
errors::{wrap, AnyError},
is_integrated_cli,
prereqs::PreReqChecker,
},
};
@@ -26,10 +27,15 @@ use log::{Level, Metadata, Record};
#[tokio::main]
async fn main() -> Result<(), std::convert::Infallible> {
let raw_args = std::env::args_os().collect::<Vec<_>>();
// todo: only parse to the standalone CLI if not integrated
let parsed = try_parse_legacy(&raw_args)
.map(|core| args::AnyCli::Integrated(args::IntegratedCli { core }))
.unwrap_or_else(|| args::AnyCli::Standalone(args::StandaloneCli::parse_from(&raw_args)));
.unwrap_or_else(|| {
if let Ok(true) = is_integrated_cli() {
args::AnyCli::Integrated(args::IntegratedCli::parse_from(&raw_args))
} else {
args::AnyCli::Standalone(args::StandaloneCli::parse_from(&raw_args))
}
});
let core = parsed.core();
let context = CommandContext {