Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'zed2' of github.com:zed-industries/zed into zed2

Browse source
This commit is contained in:
Marshall Bowers 2023-10-26 15:59:21 +02:00
commit a569c82492
4 changed files with 2283 additions and 2286 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -4304,7 +4304,6 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"settings",
"settings2", "settings2",
"similar", "similar",
"smallvec", "smallvec",

8
crates/gpui2_macros/src/test.rs
View file

@ -86,7 +86,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
let last_segment = ty.path.segments.last(); let last_segment = ty.path.segments.last();
match last_segment.map(|s| s.ident.to_string()).as_deref() { match last_segment.map(|s| s.ident.to_string()).as_deref() {
Some("StdRng") => { Some("StdRng") => {
inner_fn_args.extend(quote!(rand::SeedableRng::seed_from_u64(seed),)); inner_fn_args.extend(quote!(rand::SeedableRng::seed_from_u64(_seed),));
continue; continue;
} }
Some("Executor") => { Some("Executor") => {
@ -133,7 +133,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
gpui2::run_test( gpui2::run_test(
#num_iterations as u64, #num_iterations as u64,
#max_retries, #max_retries,
&mut |dispatcher| { &mut |dispatcher, _seed| {
let executor = gpui2::Executor::new(std::sync::Arc::new(dispatcher.clone())); let executor = gpui2::Executor::new(std::sync::Arc::new(dispatcher.clone()));
#cx_vars #cx_vars
executor.block(#inner_fn_name(#inner_fn_args)); executor.block(#inner_fn_name(#inner_fn_args));
@ -156,7 +156,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
let last_segment = ty.path.segments.last(); let last_segment = ty.path.segments.last();
if let Some("StdRng") = last_segment.map(|s| s.ident.to_string()).as_deref() { if let Some("StdRng") = last_segment.map(|s| s.ident.to_string()).as_deref() {
inner_fn_args.extend(quote!(rand::SeedableRng::seed_from_u64(seed),)); inner_fn_args.extend(quote!(rand::SeedableRng::seed_from_u64(_seed),));
continue; continue;
} }
} else if let Type::Reference(ty) = &*arg.ty { } else if let Type::Reference(ty) = &*arg.ty {
@ -212,7 +212,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
gpui2::run_test( gpui2::run_test(
#num_iterations as u64, #num_iterations as u64,
#max_retries, #max_retries,
&mut |dispatcher| { &mut |dispatcher, _seed| {
#cx_vars #cx_vars
#inner_fn_name(#inner_fn_args); #inner_fn_name(#inner_fn_args);
#cx_teardowns #cx_teardowns

4
crates/language2/Cargo.toml
View file

@ -17,7 +17,7 @@ test-support = [
"text/test-support", "text/test-support",
"tree-sitter-rust", "tree-sitter-rust",
"tree-sitter-typescript", "tree-sitter-typescript",
"settings/test-support", "settings2/test-support",
"util/test-support", "util/test-support",
] ]
@ -65,7 +65,7 @@ collections = { path = "../collections", features = ["test-support"] }
gpui2 = { path = "../gpui2", features = ["test-support"] } gpui2 = { path = "../gpui2", features = ["test-support"] }
lsp2 = { path = "../lsp2", features = ["test-support"] } lsp2 = { path = "../lsp2", features = ["test-support"] }
text = { path = "../text", features = ["test-support"] } text = { path = "../text", features = ["test-support"] }
settings = { path = "../settings", features = ["test-support"] } settings2 = { path = "../settings2", features = ["test-support"] }
util = { path = "../util", features = ["test-support"] } util = { path = "../util", features = ["test-support"] }
ctor.workspace = true ctor.workspace = true
env_logger.workspace = true env_logger.workspace = true

4556
crates/language2/src/buffer_tests.rs
View file

File diff suppressed because it is too large Load diff