Skip to content

Commit

Permalink
0.15.2
Browse files Browse the repository at this point in the history
Upgrade dprint-core
  • Loading branch information
dsherret committed Apr 30, 2022
1 parent 5be1b99 commit 6f0c321
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dprint-plugin-json"
version = "0.15.1"
version = "0.15.2"
authors = ["David Sherret <[email protected]>"]
edition = "2021"
homepage = "https://github.com/dprint/dprint-plugin-json"
Expand All @@ -26,7 +26,7 @@ tracing = ["dprint-core/tracing"]

[dependencies]
anyhow = "1.0.51"
dprint-core = { version = "0.55.0", features = ["formatting"] }
dprint-core = { version = "0.56.0", features = ["formatting"] }
jsonc-parser = { version = "0.19.0" }
serde = { version = "1.0.88", features = ["derive"] }
serde_json = { version = "1.0", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions src/configuration/resolve_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
line_width: get_value(
&mut config,
"lineWidth",
global_config.line_width.unwrap_or(DEFAULT_GLOBAL_CONFIGURATION.line_width),
global_config.line_width.unwrap_or(RECOMMENDED_GLOBAL_CONFIGURATION.line_width),
&mut diagnostics,
),
use_tabs: get_value(
&mut config,
"useTabs",
global_config.use_tabs.unwrap_or(DEFAULT_GLOBAL_CONFIGURATION.use_tabs),
global_config.use_tabs.unwrap_or(RECOMMENDED_GLOBAL_CONFIGURATION.use_tabs),
&mut diagnostics,
),
indent_width: get_value(&mut config, "indentWidth", global_config.indent_width.unwrap_or(2), &mut diagnostics),
new_line_kind: get_value(
&mut config,
"newLineKind",
global_config.new_line_kind.unwrap_or(DEFAULT_GLOBAL_CONFIGURATION.new_line_kind),
global_config.new_line_kind.unwrap_or(RECOMMENDED_GLOBAL_CONFIGURATION.new_line_kind),
&mut diagnostics,
),
comment_line_force_space_after_slashes: get_value(&mut config, "commentLine.forceSpaceAfterSlashes", true, &mut diagnostics),
Expand Down

0 comments on commit 6f0c321

Please sign in to comment.