Skip to content

Commit baa74aa

Browse files
HavunenHavunen
committed
rustfmt
1 parent 1752474 commit baa74aa

File tree

10 files changed

+109
-106
lines changed

10 files changed

+109
-106
lines changed

‎src/jsx/mod.rs‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#![allow(clippy::redundant_allocation)]
22

3+
use crate::transformations::lowercase_attrs::requires_lowercasing;
4+
use crate::transformations::parse_vnode_flag::parse_vnode_flag;
5+
use crate::transformations::transform_attribute::transform_attribute;
6+
use crate::VNodeType::Component;
7+
use crate::{
8+
inferno_flags::{ChildFlags, VNodeFlags},
9+
refresh::options::{deserialize_refresh, RefreshOptions},
10+
};
311
use serde::{Deserialize, Serialize};
412
use std::{borrow::Cow, sync::Arc};
513
use swc_config::merge::Merge;
614
use swc_core::common::comments::Comments;
715
use swc_core::common::iter::IdentifyLast;
816
use swc_core::common::util::take::Take;
9-
use swc_core::common::{FileName, Mark, SourceMap, Span, Spanned, DUMMY_SP, SyntaxContext};
17+
use swc_core::common::{FileName, Mark, SourceMap, Span, Spanned, SyntaxContext, DUMMY_SP};
1018
use swc_core::ecma::ast::*;
11-
use swc_core::ecma::atoms::{Atom};
19+
use swc_core::ecma::atoms::Atom;
1220
use swc_core::ecma::utils::{drop_span, prepend_stmt, quote_ident, ExprFactory, StmtLike};
1321
use swc_core::ecma::visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith};
1422
use swc_core::plugin::errors::HANDLER;
1523
use swc_ecma_parser::{parse_file_as_expr, Syntax};
16-
use crate::VNodeType::Component;
17-
use crate::{
18-
inferno_flags::{ChildFlags, VNodeFlags},
19-
refresh::options::{deserialize_refresh, RefreshOptions},
20-
};
21-
use crate::transformations::transform_attribute::transform_attribute;
22-
use crate::transformations::lowercase_attrs::requires_lowercasing;
23-
use crate::transformations::parse_vnode_flag::parse_vnode_flag;
2424

2525
#[cfg(test)]
2626
mod tests;
@@ -57,7 +57,7 @@ pub fn parse_expr_for_jsx(
5757
) -> Arc<Box<Expr>> {
5858
let fm = cm.new_source_file(
5959
FileName::Custom(format!("<jsx-config-{name}.js>")).into(),
60-
src
60+
src,
6161
);
6262

6363
parse_file_as_expr(
@@ -402,7 +402,11 @@ where
402402
if ident.sym == "Fragment" {
403403
vnode_kind = VNodeType::Fragment;
404404
mut_flags = VNodeFlags::ComponentUnknown as u16;
405-
name_expr = Expr::Ident(Ident::new("createFragment".into(), ident.span, Default::default()));
405+
name_expr = Expr::Ident(Ident::new(
406+
"createFragment".into(),
407+
ident.span,
408+
Default::default(),
409+
));
406410
} else {
407411
vnode_kind = Component;
408412
mut_flags = VNodeFlags::ComponentUnknown as u16;
@@ -505,7 +509,7 @@ where
505509
KeyValueProp {
506510
key: PropName::Ident(IdentName::new(
507511
"onDblClick".into(),
508-
span
512+
span,
509513
)),
510514
value: match attr.value {
511515
Some(v) => jsx_attr_value_to_expr(v)
@@ -661,7 +665,7 @@ where
661665
let converted_prop_name = if requires_lowercasing(&i.sym) {
662666
PropName::Ident(IdentName {
663667
span: i.span,
664-
sym: i.sym.to_lowercase().into()
668+
sym: i.sym.to_lowercase().into(),
665669
})
666670
} else {
667671
let converted_sym = transform_attribute(&i.sym);
@@ -675,7 +679,7 @@ where
675679
} else {
676680
PropName::Ident(IdentName {
677681
span: i.span,
678-
sym: converted_sym.into()
682+
sym: converted_sym.into(),
679683
})
680684
}
681685
};
@@ -818,7 +822,8 @@ where
818822
spread: None,
819823
expr: Box::new(Expr::Call(CallExpr {
820824
span: DUMMY_SP,
821-
ctxt: SyntaxContext::empty().apply_mark(self.unresolved_mark),
825+
ctxt: SyntaxContext::empty()
826+
.apply_mark(self.unresolved_mark),
822827
callee: self
823828
.import_create_text_vnode
824829
.get_or_insert_with(|| {

‎src/jsx/tests.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ test!(
3131
jsx(
3232
Some(t.comments.clone()),
3333
Default::default(),
34-
unresolved_mark
35-
)
34+
unresolved_mark,
35+
),
3636
)
3737
},
3838
should_always_stick_the_create_vnode_ref_to_import_when_compiled_to_commonjs,
@@ -76,7 +76,7 @@ test!(
7676
jsx(
7777
Some(t.comments.clone()),
7878
Default::default(),
79-
unresolved_mark
79+
unresolved_mark,
8080
),
8181
)
8282
},
@@ -1378,7 +1378,7 @@ fn tr(t: &mut Tester, options: Options, top_level_mark: Mark) -> impl Pass {
13781378

13791379
(
13801380
resolver(unresolved_mark, top_level_mark, false),
1381-
jsx(Some(t.comments.clone()), options, unresolved_mark)
1381+
jsx(Some(t.comments.clone()), options, unresolved_mark),
13821382
)
13831383
}
13841384

@@ -1413,9 +1413,9 @@ fn fixture_tr(t: &mut Tester, options: FixtureOptions) -> impl Pass {
14131413
Some(t.comments.clone()),
14141414
options.options,
14151415
top_level_mark,
1416-
unresolved_mark
1416+
unresolved_mark,
14171417
),
1418-
pure_annotations(Some(t.comments.clone()))
1418+
pure_annotations(Some(t.comments.clone())),
14191419
)
14201420
}
14211421

@@ -1430,8 +1430,8 @@ fn integration_tr(t: &mut Tester, options: FixtureOptions) -> impl Pass {
14301430
Some(t.comments.clone()),
14311431
options.options,
14321432
top_level_mark,
1433-
unresolved_mark
1434-
)
1433+
unresolved_mark,
1434+
),
14351435
)
14361436
}
14371437

@@ -2215,8 +2215,8 @@ test!(
22152215
jsx(
22162216
Some(t.comments.clone()),
22172217
Default::default(),
2218-
unresolved_mark
2219-
)
2218+
unresolved_mark,
2219+
),
22202220
)
22212221
},
22222222
issue_4956,
@@ -2316,7 +2316,7 @@ fn test_script(src: &str, output: &Path, options: Options) {
23162316
unresolved_mark,
23172317
),
23182318
hygiene(),
2319-
fixer(Some(&tester.comments))
2319+
fixer(Some(&tester.comments)),
23202320
));
23212321

23222322
let mut buf = vec![];

‎src/lib.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#![deny(clippy::all)]
22
#![allow(clippy::arc_with_non_send_sync)]
33

4-
use swc_core::{
5-
common::{comments::Comments, sync::Lrc, Mark, SourceMap},
6-
ecma::{ast::Program},
7-
plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
8-
};
9-
use swc_core::ecma::ast::Pass;
104
pub use self::{
115
jsx::*,
126
pure_annotations::pure_annotations,
137
refresh::{options::RefreshOptions, refresh},
148
};
9+
use swc_core::ecma::ast::Pass;
10+
use swc_core::{
11+
common::{comments::Comments, sync::Lrc, Mark, SourceMap},
12+
ecma::ast::Program,
13+
plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
14+
};
1515

1616
mod inferno_flags;
1717
mod jsx;
@@ -49,7 +49,7 @@ where
4949
refresh_options,
5050
cm.clone(),
5151
comments.clone(),
52-
top_level_mark
52+
top_level_mark,
5353
),
5454
jsx(comments.clone(), options, unresolved_mark),
5555
pure_annotations(comments),

‎src/pure_annotations/tests.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
use swc_core::common::{comments::SingleThreadedComments, sync::Lrc, FileName, Mark, SourceMap};
12
use swc_core::ecma::transforms::base::resolver;
2-
use swc_core::{
3-
common::{comments::SingleThreadedComments, sync::Lrc, FileName, Mark, SourceMap}
4-
};
53
use swc_ecma_codegen::{text_writer::JsWriter, Emitter};
64
use swc_ecma_parser::{Parser, StringInput};
75
use swc_ecma_transforms_testing::Tester;

‎src/refresh/hook.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl<'a> HookRegister<'a> {
7070
declare: false,
7171
..Default::default()
7272
}
73-
.into()
73+
.into()
7474
}
7575

7676
// The second call is around the function itself. This is used to associate a
@@ -115,7 +115,7 @@ impl<'a> HookRegister<'a> {
115115
raw: None,
116116
value: sign.into(),
117117
})
118-
.as_arg(),
118+
.as_arg(),
119119
);
120120

121121
let mut should_reset = self.should_reset;
@@ -156,9 +156,9 @@ impl<'a> HookRegister<'a> {
156156
obj: Box::new(obj),
157157
prop: MemberProp::Ident(prop),
158158
}
159-
.into(),
159+
.into(),
160160
}
161-
.as_arg(),
161+
.as_arg(),
162162
)
163163
})
164164
.collect();
@@ -182,7 +182,7 @@ impl<'a> HookRegister<'a> {
182182
}),
183183
..Default::default()
184184
}
185-
.as_arg(),
185+
.as_arg(),
186186
);
187187
}
188188

@@ -192,7 +192,7 @@ impl<'a> HookRegister<'a> {
192192
args,
193193
..Default::default()
194194
}
195-
.into()
195+
.into()
196196
}
197197

198198
fn gen_hook_register_stmt(&mut self, ident: Ident, sig: HookSig) {
@@ -202,7 +202,7 @@ impl<'a> HookRegister<'a> {
202202
span: DUMMY_SP,
203203
expr: Box::new(self.wrap_with_register(sig.handle, ident.into(), sig.hooks)),
204204
}
205-
.into(),
205+
.into(),
206206
)
207207
}
208208
}
@@ -300,9 +300,9 @@ impl<'a> VisitMut for HookRegister<'a> {
300300
// only when expr has ident
301301
match d {
302302
DefaultDecl::Fn(FnExpr {
303-
ident: Some(ident),
304-
function: f,
305-
}) if f.body.is_some() => {
303+
ident: Some(ident),
304+
function: f,
305+
}) if f.body.is_some() => {
306306
if let Some(sig) = collect_hooks(&mut f.body.as_mut().unwrap().stmts, self.cm) {
307307
self.gen_hook_register_stmt(ident.clone(), sig);
308308
}
@@ -400,10 +400,10 @@ impl<'a> HookCollector<'a> {
400400
}
401401
// hook cannot be used in class, so we're fine without SuperProp
402402
Expr::Member(MemberExpr {
403-
obj,
404-
prop: MemberProp::Ident(ident),
405-
..
406-
}) => {
403+
obj,
404+
prop: MemberProp::Ident(ident),
405+
..
406+
}) => {
407407
hook_call = Some(HookCall::Member(*obj.clone(), ident.clone()));
408408
Some(&ident.sym)
409409
}

0 commit comments

Comments
 (0)