Skip to content

Commit acf46b9

Browse files
committed
feat: #37 - Rename "nextLineIfHanging" to "sameLineUnlessHanging"
1 parent 0f7b047 commit acf46b9

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "dprint-plugin-typescript"
3-
description = "TypeScript code formatting plugin for Dprint."
3+
description = "TypeScript code formatting plugin for dprint."
44
keywords = ["formatting", "formatter", "typescript"]
5-
version = "0.25.0"
5+
version = "0.26.0"
66
authors = ["David Sherret <[email protected]>"]
77
edition = "2018"
88
license = "MIT"

src/configuration/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl ConfigurationBuilder {
119119

120120
/// Where to place the opening brace.
121121
///
122-
/// Default: `BracePosition::NextLineIfHanging`
122+
/// Default: `BracePosition::SameLineUnlessHanging`
123123
pub fn brace_position(&mut self, value: BracePosition) -> &mut Self {
124124
self.insert("bracePosition", value)
125125
}

src/configuration/resolve_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub fn resolve_config(config: HashMap<String, String>, global_config: &GlobalCon
3434
}
3535

3636
let semi_colons = get_value(&mut config, "semiColons", SemiColons::Prefer, &mut diagnostics);
37-
let brace_position = get_value(&mut config, "bracePosition", BracePosition::NextLineIfHanging, &mut diagnostics);
37+
let brace_position = get_value(&mut config, "bracePosition", BracePosition::SameLineUnlessHanging, &mut diagnostics);
3838
let next_control_flow_position = get_value(&mut config, "nextControlFlowPosition", NextControlFlowPosition::SameLine, &mut diagnostics);
3939
let operator_position = get_value(&mut config, "operatorPosition", OperatorPosition::NextLine, &mut diagnostics);
4040
let single_body_position = get_value(&mut config, "singleBodyPosition", SingleBodyPosition::Maintain, &mut diagnostics);

src/configuration/types.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ pub enum BracePosition {
6262
SameLine,
6363
/// Forces the brace to be on the next line.
6464
NextLine,
65-
/// Forces the brace to be on the next line if the same line is hanging, but otherwise uses the next.
66-
NextLineIfHanging,
65+
/// Forces the brace to be on the next line if the same line is hanging, but otherwise uses the same line.
66+
SameLineUnlessHanging,
6767
}
6868

6969
generate_str_to_from![
7070
BracePosition,
7171
[Maintain, "maintain"],
7272
[SameLine, "sameLine"],
7373
[NextLine, "nextLine"],
74-
[NextLineIfHanging, "nextLineIfHanging"]
74+
[SameLineUnlessHanging, "sameLineUnlessHanging"]
7575
];
7676

7777
/// How to space members.

src/parsing/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5137,7 +5137,7 @@ struct ParseBraceSeparatorOptions<'a> {
51375137

51385138
fn parse_brace_separator<'a>(opts: ParseBraceSeparatorOptions<'a>, context: &mut Context) -> PrintItems {
51395139
return match opts.brace_position {
5140-
BracePosition::NextLineIfHanging => {
5140+
BracePosition::SameLineUnlessHanging => {
51415141
if let Some(start_header_info) = opts.start_header_info {
51425142
conditions::new_line_if_hanging_space_otherwise(conditions::NewLineIfHangingSpaceOtherwiseOptions {
51435143
start_info: start_header_info,

0 commit comments

Comments
 (0)