Skip to content
This repository was archived by the owner on Aug 31, 2023. It is now read-only.

Commit 29b498e

Browse files
ematipicoematipico
committed
chore: codegen and clippy
1 parent 6f935cc commit 29b498e

File tree

8 files changed

+72
-15
lines changed

8 files changed

+72
-15
lines changed

‎crates/rome_cli/tests/commands/init.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn creates_config_file() {
3131
let mut content = String::new();
3232
file.read_to_string(&mut content)
3333
.expect("failed to read file from memory FS");
34-
let parsed = parse_json(&CONFIG_INIT_DEFAULT);
34+
let parsed = parse_json(CONFIG_INIT_DEFAULT);
3535
let formatted =
3636
rome_json_formatter::format_node(JsonFormatOptions::default(), &parsed.syntax())
3737
.expect("valid format document")
@@ -74,7 +74,7 @@ fn creates_config_file_when_rome_installed_via_package_manager() {
7474
let mut content = String::new();
7575
file.read_to_string(&mut content)
7676
.expect("failed to read file from memory FS");
77-
let parsed = parse_json(&CONFIG_INIT_DEFAULT_WHEN_INSTALLED);
77+
let parsed = parse_json(CONFIG_INIT_DEFAULT_WHEN_INSTALLED);
7878
let formatted =
7979
rome_json_formatter::format_node(JsonFormatOptions::default(), &parsed.syntax())
8080
.expect("valid format document")

‎crates/rome_service/src/configuration/javascript.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ pub struct JavascriptConfiguration {
2626
}
2727

2828
impl JavascriptConfiguration {
29-
pub(crate) const KNOWN_KEYS: &'static [&'static str] = &["formatter", "globals", "organizeImports"];
29+
pub(crate) const KNOWN_KEYS: &'static [&'static str] =
30+
&["formatter", "globals", "organizeImports"];
3031
}
3132

3233
impl JavascriptConfiguration {

‎crates/rome_service/src/configuration/parse/json/configuration.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::configuration::organize_imports::OrganizeImports;
12
use crate::configuration::{
23
FilesConfiguration, FormatterConfiguration, JavascriptConfiguration, LinterConfiguration,
34
};
@@ -7,7 +8,6 @@ use rome_deserialize::{DeserializationDiagnostic, VisitNode};
78
use rome_json_syntax::{JsonLanguage, JsonSyntaxNode};
89
use rome_rowan::SyntaxNode;
910
use std::num::NonZeroU64;
10-
use crate::configuration::organize_imports::OrganizeImports;
1111

1212
impl VisitJsonNode for FilesConfiguration {}
1313

‎crates/rome_service/src/configuration/parse/json/organize_imports.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ impl VisitNode<JsonLanguage> for OrganizeImports {
2323
) -> Option<()> {
2424
let (name, value) = self.get_key_and_value(key, value, diagnostics)?;
2525
let name_text = name.text();
26-
match name_text {
27-
"enabled" => {
28-
self.enabled = self.map_to_boolean(&value, name_text, diagnostics)?;
29-
}
30-
_ => {}
26+
if name_text == "enabled" {
27+
self.enabled = self.map_to_boolean(&value, name_text, diagnostics)?;
3128
}
3229

3330
Some(())

‎crates/rome_service/src/file_handlers/javascript.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,22 +369,19 @@ fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceError> {
369369
None
370370
};
371371

372-
let filter = match &mut enabled_rules {
372+
let mut filter = AnalysisFilter::default();
373+
match &mut enabled_rules {
373374
Some(rules) => {
374375
if settings.as_ref().analyzer.organize_imports_enabled {
375376
rules.push(RuleFilter::Rule("correctness", "organizeImports"));
376377
}
377378

378-
let mut filter = AnalysisFilter::from_enabled_rules(Some(rules.as_slice()));
379-
379+
filter.enabled_rules = Some(rules.as_slice());
380380
filter.categories =
381381
RuleCategories::SYNTAX | RuleCategories::LINT | RuleCategories::ACTION;
382-
filter
383382
}
384383
_ => {
385-
let mut filter = AnalysisFilter::default();
386384
filter.categories = RuleCategories::SYNTAX | RuleCategories::LINT;
387-
filter
388385
}
389386
};
390387

‎editors/vscode/configuration_schema.json‎

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm/backend-jsonrpc/src/workspace.ts‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm/rome/configuration_schema.json‎

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)