Skip to content

Commit b2e6abf

Browse files
committed
revert(imports): drop module.mergeImports (was never wired, will revisit when actually implemented)
1 parent 014d938 commit b2e6abf

7 files changed

Lines changed: 0 additions & 207 deletions

File tree

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ This reorders imports across the import block into the listed groups and inserts
4646
|---|---|---|---|
4747
| `module.importGroups` | array | `[]` (off) | Ordered list of groups. Empty disables the feature. |
4848
| `module.typeImports` | `"separate"` \| `"interleave"` | `"separate"` | Whether `import type` lines form their own category. |
49-
| `module.mergeImports` | bool | `false` | Merge multiple imports from the same source (Biome-style). Currently detection only; emission TBD. |
5049
| `module.builtinsRuntime` | `"node"` \| `"deno"` \| `"bun"` \| `"none"` | `"node"` | Which runtime's built-in module list classifies as `builtin`. |
5150

5251
### Built-in categories
@@ -85,5 +84,4 @@ First-match-wins across the list, so position determines precedence.
8584
- Descending sort not supported.
8685
- TS `import X = require(...)` not reordered.
8786
- Imports inside nested `declare module "..."` bodies are not classified.
88-
- `module.mergeImports` is currently detection-only; merged emission TBD in a follow-up.
8987
- Currently, an import with `// dprint-ignore` is reordered like any other; barrier treatment is planned for a follow-up.

deployment/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,11 +1067,6 @@
10671067
"default": "separate",
10681068
"enum": ["separate", "interleave"]
10691069
},
1070-
"module.mergeImports": {
1071-
"description": "Merge multiple imports from the same source into one declaration.",
1072-
"type": "boolean",
1073-
"default": false
1074-
},
10751070
"module.builtinsRuntime": {
10761071
"description": "Which runtime's built-in modules count as `builtin`.",
10771072
"type": "string",

src/configuration/builder.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -592,13 +592,6 @@ impl ConfigurationBuilder {
592592
self.insert("module.typeImports", value.to_string().into())
593593
}
594594

595-
/// Merge multiple imports from the same source into one declaration.
596-
///
597-
/// Default: `false`
598-
pub fn module_merge_imports(&mut self, value: bool) -> &mut Self {
599-
self.insert("module.mergeImports", value.into())
600-
}
601-
602595
/// Which runtime's built-in modules count as `builtin`.
603596
///
604597
/// Default: `Node`

src/configuration/resolve_config.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
134134
),
135135
module_import_groups: parse_import_groups(&mut config, &mut diagnostics),
136136
module_type_imports: get_value(&mut config, "module.typeImports", TypeImportsMode::Separate, &mut diagnostics),
137-
module_merge_imports: get_value(&mut config, "module.mergeImports", false, &mut diagnostics),
138137
module_builtins_runtime: get_value(&mut config, "module.builtinsRuntime", BuiltinsRuntime::Node, &mut diagnostics),
139138
/* ignore comments */
140139
ignore_node_comment_text: get_value(&mut config, "ignoreNodeCommentText", String::from("dprint-ignore"), &mut diagnostics),
@@ -354,13 +353,6 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
354353
}
355354
}
356355

357-
if resolved_config.module_merge_imports {
358-
diagnostics.push(ConfigurationDiagnostic {
359-
property_name: "module.mergeImports".to_string(),
360-
message: "module.mergeImports is currently not implemented; setting it to true has no effect. Tracked for a future release.".to_string(),
361-
});
362-
}
363-
364356
return ResolveConfigurationResult {
365357
config: resolved_config,
366358
diagnostics,
@@ -480,7 +472,6 @@ mod import_groups_resolution_tests {
480472
let r = resolve(serde_json::json!({}));
481473
assert!(r.config.module_import_groups.is_empty());
482474
assert!(matches!(r.config.module_type_imports, TypeImportsMode::Separate));
483-
assert!(!r.config.module_merge_imports);
484475
assert!(matches!(r.config.module_builtins_runtime, BuiltinsRuntime::Node));
485476
assert!(r.diagnostics.is_empty());
486477
}

src/configuration/types.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,6 @@ pub struct Configuration {
440440
pub module_import_groups: Vec<ImportGroup>,
441441
#[serde(rename = "module.typeImports", default = "default_type_imports_mode")]
442442
pub module_type_imports: TypeImportsMode,
443-
#[serde(rename = "module.mergeImports", default)]
444-
pub module_merge_imports: bool,
445443
#[serde(rename = "module.builtinsRuntime", default = "default_builtins_runtime")]
446444
pub module_builtins_runtime: BuiltinsRuntime,
447445
/* ignore comments */

src/generation/imports/merge.rs

Lines changed: 0 additions & 181 deletions
This file was deleted.

src/generation/imports/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
pub mod classify;
22
pub mod partition;
3-
pub mod merge;
43
pub mod resolved;

0 commit comments

Comments
 (0)