chore: update dprint-core to 0.63

Cargo.toml

@@ -26,13 +26,13 @@ tracing = ["dprint-core/tracing"]
 
 [dependencies]
 anyhow = "1.0.64"
-dprint-core = { version = "0.62.1", features = ["formatting"] }
-jsonc-parser = { version = "0.21.1" }
+dprint-core = { version = "0.63.3", features = ["formatting"] }
+jsonc-parser = { version = "0.23.0" }
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 text_lines = "0.6.0"
 
 [dev-dependencies]
 debug-here = "0.2"
-dprint-development = "0.9.1"
+dprint-development = "0.9.5"
 serde_json = { version = "1.0" }

dprint.json

@@ -13,10 +13,10 @@
     "**/benches/data"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.88.1.wasm",
-    "https://plugins.dprint.dev/json-0.17.4.wasm",
+    "https://plugins.dprint.dev/typescript-0.88.4.wasm",
+    "https://plugins.dprint.dev/json-0.19.0.wasm",
     "https://plugins.dprint.dev/markdown-0.16.2.wasm",
     "https://plugins.dprint.dev/toml-0.5.4.wasm",
-    "https://plugins.dprint.dev/exec-0.4.3.json@42343548b8022c99b1d750be6b894fe6b6c7ee25f72ae9f9082226dd2e515072"
+    "https://plugins.dprint.dev/exec-0.4.4.json@c207bf9b9a4ee1f0ecb75c594f774924baf62e8e53a2ce9d873816a408cecbf7"
   ]
 }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.73.0"
+channel = "1.74.0"
 components = ["clippy", "rustfmt"]

src/configuration/builder.rs

@@ -1,6 +1,4 @@
-use dprint_core::configuration::{
-  resolve_global_config, ConfigKeyMap, ConfigKeyValue, GlobalConfiguration, NewLineKind,
-};
+use dprint_core::configuration::{ConfigKeyMap, ConfigKeyValue, GlobalConfiguration, NewLineKind};
 
 use super::*;
 
@@ -32,8 +30,8 @@ impl ConfigurationBuilder {
     if let Some(global_config) = &self.global_config {
       resolve_config(self.config.clone(), global_config).config
     } else {
-      let global_config = resolve_global_config(ConfigKeyMap::new(), &Default::default()).config;
-      resolve_config(self.config.clone(), &global_config).config
+      let config = self.config.clone();
+      resolve_config(config, &GlobalConfiguration::default()).config
     }
   }
 
@@ -163,11 +161,7 @@ mod tests {
 
     let inner_config = config.get_inner_config();
     assert_eq!(inner_config.len(), 11);
-    let diagnostics = resolve_config(
-      inner_config,
-      &resolve_global_config(ConfigKeyMap::new(), &Default::default()).config,
-    )
-    .diagnostics;
+    let diagnostics = resolve_config(inner_config, &GlobalConfiguration::default()).diagnostics;
     assert_eq!(diagnostics.len(), 0);
   }
 
@@ -177,7 +171,7 @@ mod tests {
     global_config.insert(String::from("lineWidth"), 90.into());
     global_config.insert(String::from("newLineKind"), "crlf".into());
     global_config.insert(String::from("useTabs"), true.into());
-    let global_config = resolve_global_config(global_config, &Default::default()).config;
+    let global_config = resolve_global_config(&mut global_config).config;
     let mut config_builder = ConfigurationBuilder::new();
     let config = config_builder.global_config(global_config).build();
     assert_eq!(config.line_width, 90);

src/configuration/resolve_config.rs

@@ -12,8 +12,8 @@ use dprint_core::configuration::*;
 /// use dprint_core::configuration::resolve_global_config;
 /// use dprint_plugin_json::configuration::resolve_config;
 ///
-/// let config_map = ConfigKeyMap::new(); // get a collection of key value pairs from somewhere
-/// let global_config_result = resolve_global_config(config_map, &Default::default());
+/// let mut config_map = ConfigKeyMap::new(); // get a collection of key value pairs from somewhere
+/// let global_config_result = resolve_global_config(&mut config_map);
 ///
 /// // check global_config_result.diagnostics here...
 ///