Updates dependenciec & fixed breaking changes

Author: lizclipse

.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-unknown-unknown"

Cargo.toml

@@ -22,8 +22,8 @@ lua54 = ["stylua/lua54"]
 luau = ["stylua/luau"]
 
 [dependencies]
-anyhow = "1.0.65"
-dprint-core = { version = "0.59.0", features = ["wasm"] }
-serde = { version = "1.0.145", features = ["derive"] }
-serde_json = "1.0.85"
-stylua = { version = "0.15.2", features = ["serialize", "fromstr"], default-features = false }
+anyhow = "1.0.80"
+dprint-core = { version = "0.66.1", features = ["wasm"] }
+serde = { version = "1.0.197", features = ["derive"] }
+serde_json = "1.0.114"
+stylua = { version = "0.20.0", features = ["serialize", "fromstr"], default-features = false }

dprint.json

@@ -16,8 +16,11 @@
   "toml": {
   },
 
-  "rustfmt": {
-    "max_width": 100
+  "exec": {
+    "commands": [{
+      "command": "rustfmt --edition 2021",
+      "exts": ["rs"]
+    }]
   },
 
   "includes": ["**/*"],
@@ -26,6 +29,6 @@
     "https://plugins.dprint.dev/json-0.15.6.wasm",
     "https://plugins.dprint.dev/markdown-0.14.1.wasm",
     "https://plugins.dprint.dev/toml-0.5.4.wasm",
-    "https://plugins.dprint.dev/rustfmt-0.6.2.json@886c6f3161cf020c2d75160262b0f56d74a521e05cfb91ec4f956650c8ca76ca"
+    "https://plugins.dprint.dev/exec-0.4.4.json@c207bf9b9a4ee1f0ecb75c594f774924baf62e8e53a2ce9d873816a408cecbf7"
   ]
 }

src/config.rs

@@ -1,6 +1,8 @@
 use dprint_core::configuration::NewLineKind;
 use serde::Serialize;
-use stylua_lib::{CallParenType, CollapseSimpleStatement, IndentType, QuoteStyle};
+use stylua_lib::{
+    CallParenType, CollapseSimpleStatement, IndentType, LineEndings, QuoteStyle, SortRequiresConfig,
+};
 
 #[derive(Serialize, Clone)]
 #[serde(rename_all = "camelCase")]
@@ -15,19 +17,29 @@ pub struct Configuration {
     pub quote_style: QuoteStyle,
     pub call_parentheses: CallParenType,
     pub collapse_simple_statement: CollapseSimpleStatement,
+    pub sort_requires: bool,
 }
 
 impl From<&Configuration> for stylua_lib::Config {
     fn from(conf: &Configuration) -> Self {
-        stylua_lib::Config::new()
-            .with_column_width(conf.line_width as usize)
-            .with_indent_type(match conf.use_tabs {
+        stylua_lib::Config {
+            column_width: conf.line_width as usize,
+            line_endings: match conf.new_line_kind {
+                NewLineKind::CarriageReturnLineFeed => LineEndings::Windows,
+                _ => LineEndings::Unix,
+            },
+            indent_type: match conf.use_tabs {
                 true => IndentType::Tabs,
                 false => IndentType::Spaces,
-            })
-            .with_indent_width(conf.indent_width as usize)
-            .with_quote_style(conf.quote_style)
-            .with_call_parentheses(conf.call_parentheses)
-            .with_collapse_simple_statement(conf.collapse_simple_statement)
+            },
+            indent_width: conf.indent_width as usize,
+            quote_style: conf.quote_style,
+            call_parentheses: conf.call_parentheses,
+            collapse_simple_statement: conf.collapse_simple_statement,
+            sort_requires: SortRequiresConfig {
+                enabled: conf.sort_requires,
+            },
+            ..Default::default()
+        }
     }
 }

src/plugin.rs

@@ -5,7 +5,7 @@ use dprint_core::{
         self, ConfigKeyMap, GlobalConfiguration, ResolveConfigurationResult,
         RECOMMENDED_GLOBAL_CONFIGURATION,
     },
-    plugins::{FormatResult, PluginInfo, SyncPluginHandler},
+    plugins::{FileMatchingInfo, FormatResult, PluginInfo, SyncPluginHandler, SyncPluginInfo},
 };
 use stylua_lib::{LineEndings, OutputVerification};
 
@@ -61,19 +61,25 @@ impl SyncPluginHandler<Configuration> for StyluaPluginHandler {
             quote_style: configuration::get_value(
                 &mut config,
                 "quoteStyle",
-                default_config.quote_style(),
+                default_config.quote_style,
                 &mut diagnostics,
             ),
             call_parentheses: configuration::get_value(
                 &mut config,
                 "callParentheses",
-                default_config.call_parentheses(),
+                default_config.call_parentheses,
                 &mut diagnostics,
             ),
             collapse_simple_statement: configuration::get_value(
                 &mut config,
                 "collapseSimpleStatement",
-                default_config.collapse_simple_statement(),
+                default_config.collapse_simple_statement,
+                &mut diagnostics,
+            ),
+            sort_requires: configuration::get_value(
+                &mut config,
+                "sortRequires",
+                default_config.sort_requires.enabled,
                 &mut diagnostics,
             ),
         };
@@ -86,16 +92,22 @@ impl SyncPluginHandler<Configuration> for StyluaPluginHandler {
         }
     }
 
-    fn plugin_info(&mut self) -> PluginInfo {
-        PluginInfo {
-            name: env!("CARGO_PKG_NAME").to_string(),
-            version: env!("CARGO_PKG_VERSION").to_string(),
-            config_key: "stylua".to_string(),
-            file_extensions: vec!["lua".to_string()],
-            file_names: vec![],
-            help_url: concat!(env!("CARGO_PKG_REPOSITORY"), "#readme").to_string(),
-            config_schema_url: "".to_string(),
-            update_url: Some("https://plugins.dprint.dev/RubixDev/stylua/latest.json".to_string()),
+    fn plugin_info(&mut self) -> SyncPluginInfo {
+        SyncPluginInfo {
+            info: PluginInfo {
+                name: env!("CARGO_PKG_NAME").to_string(),
+                version: env!("CARGO_PKG_VERSION").to_string(),
+                config_key: "stylua".to_string(),
+                help_url: concat!(env!("CARGO_PKG_REPOSITORY"), "#readme").to_string(),
+                config_schema_url: "".to_string(),
+                update_url: Some(
+                    "https://plugins.dprint.dev/RubixDev/stylua/latest.json".to_string(),
+                ),
+            },
+            file_matching: FileMatchingInfo {
+                file_extensions: vec!["lua".to_string()],
+                file_names: vec![],
+            },
         }
     }
 
@@ -106,21 +118,23 @@ impl SyncPluginHandler<Configuration> for StyluaPluginHandler {
     fn format(
         &mut self,
         _file_path: &Path,
-        file_text: &str,
+        file_text: Vec<u8>,
         config: &Configuration,
-        _format_with_host: impl FnMut(&Path, String, &ConfigKeyMap) -> FormatResult,
+        _format_with_host: impl FnMut(&std::path::Path, Vec<u8>, &ConfigKeyMap) -> FormatResult,
     ) -> FormatResult {
-        let stylua_config = stylua_lib::Config::from(config).with_line_endings(
-            match configuration::resolve_new_line_kind(file_text, config.new_line_kind) {
+        let file_text = String::from_utf8(file_text)?;
+
+        let mut stylua_config = stylua_lib::Config::from(config);
+        stylua_config.line_endings =
+            match configuration::resolve_new_line_kind(&file_text, config.new_line_kind) {
                 "\r\n" => LineEndings::Windows,
                 "\n" => LineEndings::Unix,
                 // Fall back to \n in case upstream function changes
                 _ => LineEndings::Unix,
-            },
-        );
+            };
 
         let result = stylua_lib::format_code(
-            file_text,
+            &file_text,
             stylua_config,
             None,
             match config.verify {
@@ -131,7 +145,7 @@ impl SyncPluginHandler<Configuration> for StyluaPluginHandler {
         if result == file_text {
             Ok(None)
         } else {
-            Ok(Some(result))
+            Ok(Some(result.into_bytes()))
         }
     }
 }