Skip to content

Commit 43071e8

Browse files
internal: follow test style guide in typing.rs
1 parent 7f53d3a commit 43071e8

File tree

1 file changed

+104
-96
lines changed

1 file changed

+104
-96
lines changed

crates/ide/src/typing.rs

Lines changed: 104 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ mod tests {
222222
assert_eq_text!(ra_fixture_after, &actual);
223223
}
224224

225-
fn type_char_noop(char_typed: char, before: &str) {
226-
let file_change = do_type_char(char_typed, before);
225+
fn type_char_noop(char_typed: char, ra_fixture_before: &str) {
226+
let file_change = do_type_char(char_typed, ra_fixture_before);
227227
assert!(file_change.is_none())
228228
}
229229

@@ -240,16 +240,16 @@ mod tests {
240240
// ");
241241
type_char(
242242
'=',
243-
r"
243+
r#"
244244
fn foo() {
245245
let foo $0 1 + 1
246246
}
247-
",
248-
r"
247+
"#,
248+
r#"
249249
fn foo() {
250250
let foo = 1 + 1;
251251
}
252-
",
252+
"#,
253253
);
254254
// do_check(r"
255255
// fn foo() {
@@ -268,27 +268,27 @@ fn foo() {
268268
fn indents_new_chain_call() {
269269
type_char(
270270
'.',
271-
r"
272-
fn main() {
273-
xs.foo()
274-
$0
275-
}
276-
",
277-
r"
278-
fn main() {
279-
xs.foo()
280-
.
281-
}
282-
",
271+
r#"
272+
fn main() {
273+
xs.foo()
274+
$0
275+
}
276+
"#,
277+
r#"
278+
fn main() {
279+
xs.foo()
280+
.
281+
}
282+
"#,
283283
);
284284
type_char_noop(
285285
'.',
286-
r"
287-
fn main() {
288-
xs.foo()
289-
$0
290-
}
291-
",
286+
r#"
287+
fn main() {
288+
xs.foo()
289+
$0
290+
}
291+
"#,
292292
)
293293
}
294294

@@ -297,26 +297,26 @@ fn foo() {
297297
type_char(
298298
'.',
299299
r"
300-
fn main() {
301-
xs.foo()
302-
$0;
303-
}
304-
",
305-
r"
306-
fn main() {
307-
xs.foo()
308-
.;
309-
}
300+
fn main() {
301+
xs.foo()
302+
$0;
303+
}
310304
",
305+
r#"
306+
fn main() {
307+
xs.foo()
308+
.;
309+
}
310+
"#,
311311
);
312312
type_char_noop(
313313
'.',
314-
r"
315-
fn main() {
316-
xs.foo()
317-
$0;
318-
}
319-
",
314+
r#"
315+
fn main() {
316+
xs.foo()
317+
$0;
318+
}
319+
"#,
320320
)
321321
}
322322

@@ -345,90 +345,98 @@ fn main() {
345345
fn indents_continued_chain_call() {
346346
type_char(
347347
'.',
348-
r"
349-
fn main() {
350-
xs.foo()
351-
.first()
352-
$0
353-
}
354-
",
355-
r"
356-
fn main() {
357-
xs.foo()
358-
.first()
359-
.
360-
}
361-
",
348+
r#"
349+
fn main() {
350+
xs.foo()
351+
.first()
352+
$0
353+
}
354+
"#,
355+
r#"
356+
fn main() {
357+
xs.foo()
358+
.first()
359+
.
360+
}
361+
"#,
362362
);
363363
type_char_noop(
364364
'.',
365-
r"
366-
fn main() {
367-
xs.foo()
368-
.first()
369-
$0
370-
}
371-
",
365+
r#"
366+
fn main() {
367+
xs.foo()
368+
.first()
369+
$0
370+
}
371+
"#,
372372
);
373373
}
374374

375375
#[test]
376376
fn indents_middle_of_chain_call() {
377377
type_char(
378378
'.',
379-
r"
380-
fn source_impl() {
381-
let var = enum_defvariant_list().unwrap()
382-
$0
383-
.nth(92)
384-
.unwrap();
385-
}
386-
",
387-
r"
388-
fn source_impl() {
389-
let var = enum_defvariant_list().unwrap()
390-
.
391-
.nth(92)
392-
.unwrap();
393-
}
394-
",
379+
r#"
380+
fn source_impl() {
381+
let var = enum_defvariant_list().unwrap()
382+
$0
383+
.nth(92)
384+
.unwrap();
385+
}
386+
"#,
387+
r#"
388+
fn source_impl() {
389+
let var = enum_defvariant_list().unwrap()
390+
.
391+
.nth(92)
392+
.unwrap();
393+
}
394+
"#,
395395
);
396396
type_char_noop(
397397
'.',
398-
r"
399-
fn source_impl() {
400-
let var = enum_defvariant_list().unwrap()
401-
$0
402-
.nth(92)
403-
.unwrap();
404-
}
405-
",
398+
r#"
399+
fn source_impl() {
400+
let var = enum_defvariant_list().unwrap()
401+
$0
402+
.nth(92)
403+
.unwrap();
404+
}
405+
"#,
406406
);
407407
}
408408

409409
#[test]
410410
fn dont_indent_freestanding_dot() {
411411
type_char_noop(
412412
'.',
413-
r"
414-
fn main() {
415-
$0
416-
}
417-
",
413+
r#"
414+
fn main() {
415+
$0
416+
}
417+
"#,
418418
);
419419
type_char_noop(
420420
'.',
421-
r"
422-
fn main() {
423-
$0
424-
}
425-
",
421+
r#"
422+
fn main() {
423+
$0
424+
}
425+
"#,
426426
);
427427
}
428428

429429
#[test]
430430
fn adds_space_after_return_type() {
431-
type_char('>', "fn foo() -$0{ 92 }", "fn foo() -> { 92 }")
431+
type_char(
432+
'>',
433+
r#"
434+
fn foo() -$0{ 92 }
435+
"#,
436+
r#"
437+
fn foo() -> { 92 }
438+
"#,
439+
);
432440
}
433441

434442
#[test]

0 commit comments

Comments
 (0)