Fix newline kind detection

Author: RubixDev

src/config.rs

@@ -1,6 +1,6 @@
 use dprint_core::configuration::NewLineKind;
 use serde::Serialize;
-use stylua_lib::{CallParenType, CollapseSimpleStatement, IndentType, LineEndings, QuoteStyle};
+use stylua_lib::{CallParenType, CollapseSimpleStatement, IndentType, QuoteStyle};
 
 #[derive(Serialize, Clone)]
 #[serde(rename_all = "camelCase")]
@@ -26,13 +26,6 @@ impl From<&Configuration> for stylua_lib::Config {
                 false => IndentType::Spaces,
             })
             .with_indent_width(conf.indent_width as usize)
-            .with_line_endings(match conf.new_line_kind {
-                NewLineKind::Auto | NewLineKind::LineFeed => LineEndings::Unix,
-                NewLineKind::CarriageReturnLineFeed => LineEndings::Windows,
-                // TODO: fix
-                NewLineKind::System if cfg!(windows) => LineEndings::Windows,
-                NewLineKind::System => LineEndings::Unix,
-            })
             .with_quote_style(conf.quote_style)
             .with_call_parentheses(conf.call_parentheses)
             .with_collapse_simple_statement(conf.collapse_simple_statement)

src/plugin.rs

@@ -7,7 +7,7 @@ use dprint_core::{
     },
     plugins::{FormatResult, PluginInfo, SyncPluginHandler},
 };
-use stylua_lib::OutputVerification;
+use stylua_lib::{OutputVerification, LineEndings};
 
 use crate::config::Configuration;
 
@@ -110,9 +110,18 @@ impl SyncPluginHandler<Configuration> for StyluaPluginHandler {
         config: &Configuration,
         _format_with_host: impl FnMut(&Path, String, &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) {
+                "\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,
-            stylua_lib::Config::from(config),
+            stylua_config,
             None,
             match config.verify {
                 true => OutputVerification::Full,