feat: dprint-core 0.47

Author: dsherret

Cargo.lock

@@ -25,8 +25,8 @@ wasm = ["dprint-core/wasm"]
 
 [dependencies]
 anyhow = "1.0.51"
-dprint-core = { version = "0.66.1", features = ["formatting"] }
-jsonc-parser = "0.26.0"
+dprint-core = { version = "0.67.4", features = ["formatting"] }
+jsonc-parser = "0.26.2"
 serde = { version = "1.0.108", features = ["derive"] }
 serde_json = "1.0"
 

Cargo.toml

@@ -1,13 +1,19 @@
-use super::configuration::{resolve_config, Configuration};
+use super::configuration::resolve_config;
+use super::configuration::Configuration;
 
-use dprint_core::configuration::{ConfigKeyMap, GlobalConfiguration, ResolveConfigurationResult};
+use dprint_core::configuration::ConfigKeyMap;
+use dprint_core::configuration::GlobalConfiguration;
 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::FormatRange;
 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;
 
 struct JupyterPluginHandler;
 
@@ -16,45 +22,56 @@ impl SyncPluginHandler<Configuration> for JupyterPluginHandler {
     &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: "jupyter".to_string(),
-        help_url: "https://dprint.dev/plugins/jupyter".to_string(),
-        config_schema_url: format!(
-          "https://plugins.dprint.dev/dprint/dprint-plugin-jupyter/{}/schema.json",
-          version
-        ),
-        update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-jupyter/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!["ipynb".to_string()],
         file_names: vec![],
       },
     }
   }
 
+  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: "jupyter".to_string(),
+      help_url: "https://dprint.dev/plugins/jupyter".to_string(),
+      config_schema_url: format!(
+        "https://plugins.dprint.dev/dprint/dprint-plugin-jupyter/{}/schema.json",
+        version
+      ),
+      update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-jupyter/latest.json".to_string()),
+    }
+  }
+
+  fn check_config_updates(&self, _message: CheckConfigUpdatesMessage) -> Result<Vec<ConfigChange>, anyhow::Error> {
+    Ok(Vec::new())
+  }
+
   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,
-    mut 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)?;
+    let file_text = String::from_utf8(request.file_bytes)?;
     super::format_text(&file_text, |path, text| {
-      let maybe_bytes = format_with_host(path, text.into_bytes(), &ConfigKeyMap::new())?;
+      let additional_config = ConfigKeyMap::new();
+      let request = SyncHostFormatRequest {
+        file_path: &path,
+        file_bytes: text.as_bytes(),
+        range: FormatRange::None,
+        override_config: &additional_config,
+      };
+      let maybe_bytes = format_with_host(request)?;
       match maybe_bytes {
         Some(bytes) => Ok(Some(String::from_utf8(bytes)?)),
         None => Ok(None),