feat: dprint-core 0.47

Author: dsherret

Cargo.lock

@@ -26,9 +26,9 @@ tracing = ["dprint-core/tracing"]
 
 [dependencies]
 anyhow = "1.0.64"
-dprint-core = { version = "0.66.2", features = ["formatting"] }
+dprint-core = { version = "0.67.4", features = ["formatting"] }
 dprint-core-macros = "0.1.0"
-jsonc-parser = { version = "0.26.0" }
+jsonc-parser = { version = "0.26.2" }
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 text_lines = "0.6.0"

Cargo.toml

@@ -124,7 +124,7 @@ fn get_trailing_comma_files(
   diagnostics: &mut Vec<ConfigurationDiagnostic>,
 ) -> Vec<String> {
   let mut entries = Vec::with_capacity(0);
-  if let Some(values) = config.remove(key) {
+  if let Some(values) = config.shift_remove(key) {
     if let ConfigKeyValue::Array(values) = values {
       entries = Vec::with_capacity(values.len() * 2);
       for (i, value) in values.into_iter().enumerate() {

src/configuration/resolve_config.rs

@@ -1,13 +1,15 @@
 use dprint_core::configuration::ConfigKeyMap;
 use dprint_core::configuration::GlobalConfiguration;
-use dprint_core::configuration::ResolveConfigurationResult;
 use dprint_core::generate_plugin_code;
+use dprint_core::plugins::CheckConfigUpdatesMessage;
+use dprint_core::plugins::ConfigChange;
 use dprint_core::plugins::FileMatchingInfo;
 use dprint_core::plugins::FormatResult;
 use dprint_core::plugins::PluginInfo;
+use dprint_core::plugins::PluginResolveConfigurationResult;
+use dprint_core::plugins::SyncFormatRequest;
+use dprint_core::plugins::SyncHostFormatRequest;
 use dprint_core::plugins::SyncPluginHandler;
-use dprint_core::plugins::SyncPluginInfo;
-use std::path::Path;
 
 use super::configuration::resolve_config;
 use super::configuration::Configuration;
@@ -19,44 +21,49 @@ impl SyncPluginHandler<Configuration> for JsonPluginHandler {
     &mut self,
     config: ConfigKeyMap,
     global_config: &GlobalConfiguration,
-  ) -> ResolveConfigurationResult<Configuration> {
-    resolve_config(config, global_config)
-  }
-
-  fn plugin_info(&mut self) -> SyncPluginInfo {
-    let version = env!("CARGO_PKG_VERSION").to_string();
-    SyncPluginInfo {
-      info: PluginInfo {
-        name: env!("CARGO_PKG_NAME").to_string(),
-        version: version.clone(),
-        config_key: "json".to_string(),
-        help_url: "https://dprint.dev/plugins/json".to_string(),
-        config_schema_url: format!(
-          "https://plugins.dprint.dev/dprint/dprint-plugin-json/{}/schema.json",
-          version
-        ),
-        update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-json/latest.json".to_string()),
-      },
+  ) -> PluginResolveConfigurationResult<Configuration> {
+    let config = resolve_config(config, global_config);
+    PluginResolveConfigurationResult {
+      config: config.config,
+      diagnostics: config.diagnostics,
       file_matching: FileMatchingInfo {
         file_extensions: vec!["json".to_string(), "jsonc".to_string()],
         file_names: vec![],
       },
     }
   }
 
+  fn check_config_updates(&self, _message: CheckConfigUpdatesMessage) -> Result<Vec<ConfigChange>, anyhow::Error> {
+    Ok(Vec::new())
+  }
+
+  fn plugin_info(&mut self) -> PluginInfo {
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    PluginInfo {
+      name: env!("CARGO_PKG_NAME").to_string(),
+      version: version.clone(),
+      config_key: "json".to_string(),
+      help_url: "https://dprint.dev/plugins/json".to_string(),
+      config_schema_url: format!(
+        "https://plugins.dprint.dev/dprint/dprint-plugin-json/{}/schema.json",
+        version
+      ),
+      update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-json/latest.json".to_string()),
+    }
+  }
+
   fn license_text(&mut self) -> String {
     std::str::from_utf8(include_bytes!("../LICENSE")).unwrap().into()
   }
 
   fn format(
     &mut self,
-    file_path: &Path,
-    file_bytes: Vec<u8>,
-    config: &Configuration,
-    _format_with_host: impl FnMut(&Path, Vec<u8>, &ConfigKeyMap) -> FormatResult,
+    request: SyncFormatRequest<Configuration>,
+    _format_with_host: impl FnMut(SyncHostFormatRequest) -> FormatResult,
   ) -> FormatResult {
-    let file_text = String::from_utf8(file_bytes)?;
-    super::format_text(file_path, &file_text, config).map(|maybe_text| maybe_text.map(|t| t.into_bytes()))
+    let file_text = String::from_utf8(request.file_bytes)?;
+    super::format_text(request.file_path, &file_text, request.config)
+      .map(|maybe_text| maybe_text.map(|t| t.into_bytes()))
   }
 }