language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-04 02:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: CLI subcommands and argv (#3886)

Browse source
This commit is contained in:
Bartek Iwańczuk 2020-02-04 20:24:33 +01:00 • committed by GitHub
parent 2ab49a80a6
commit 184be99f5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 332 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

59
cli/worker.rs
View file

@ -230,22 +230,13 @@ mod tests {
.join("cli/tests/esm_imports_a.js");
let module_specifier =
ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
let global_state = ThreadSafeGlobalState::new(
flags::DenoFlags {
argv: vec![String::from("./deno"), module_specifier.to_string()],
..flags::DenoFlags::default()
},
Progress::new(),
)
.unwrap();
let global_state =
ThreadSafeGlobalState::new(flags::DenoFlags::default(), Progress::new())
.unwrap();
let (int, ext) = ThreadSafeState::create_channels();
let state = ThreadSafeState::new(
global_state,
None,
Some(module_specifier.clone()),
int,
)
.unwrap();
let state =
ThreadSafeState::new(global_state, None, module_specifier.clone(), int)
.unwrap();
let state_ = state.clone();
tokio_util::run_basic(async move {
let mut worker =
@ -275,22 +266,13 @@ mod tests {
.join("tests/circular1.ts");
let module_specifier =
ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
let global_state = ThreadSafeGlobalState::new(
flags::DenoFlags {
argv: vec![String::from("deno"), module_specifier.to_string()],
..flags::DenoFlags::default()
},
Progress::new(),
)
.unwrap();
let global_state =
ThreadSafeGlobalState::new(flags::DenoFlags::default(), Progress::new())
.unwrap();
let (int, ext) = ThreadSafeState::create_channels();
let state = ThreadSafeState::new(
global_state,
None,
Some(module_specifier.clone()),
int,
)
.unwrap();
let state =
ThreadSafeState::new(global_state, None, module_specifier.clone(), int)
.unwrap();
let state_ = state.clone();
tokio_util::run_basic(async move {
let mut worker =
@ -321,16 +303,20 @@ mod tests {
.join("cli/tests/006_url_imports.ts");
let module_specifier =
ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
let mut flags = flags::DenoFlags::default();
flags.argv = vec![String::from("deno"), module_specifier.to_string()];
flags.reload = true;
let flags = flags::DenoFlags {
subcommand: flags::DenoSubcommand::Run {
script: module_specifier.to_string(),
},
reload: true,
..flags::DenoFlags::default()
};
let global_state =
ThreadSafeGlobalState::new(flags, Progress::new()).unwrap();
let (int, ext) = ThreadSafeState::create_channels();
let state = ThreadSafeState::new(
global_state.clone(),
None,
Some(module_specifier.clone()),
module_specifier.clone(),
int,
)
.unwrap();
@ -361,10 +347,7 @@ mod tests {
fn create_test_worker() -> MainWorker {
let (int, ext) = ThreadSafeState::create_channels();
let state = ThreadSafeState::mock(
vec![String::from("./deno"), String::from("hello.js")],
int,
);
let state = ThreadSafeState::mock("./hello.js", int);
let mut worker = MainWorker::new(
"TEST".to_string(),
startup_data::deno_isolate_init(),