suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use default line ending in open command (#7357)

pull/7035/head
Alex 2023-06-17 21:36:36 +02:00 committed by GitHub
parent b4fe31cad6
commit d5af6031f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helix-view/src/document.rs
View File

@ -31,7 +31,6 @@ use helix_core::{
line_ending::auto_detect_line_ending, line_ending::auto_detect_line_ending,
syntax::{self, LanguageConfiguration}, syntax::{self, LanguageConfiguration},
ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction, ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
NATIVE_LINE_ENDING,
}; };
use crate::editor::{Config, RedrawHandle}; use crate::editor::{Config, RedrawHandle};
@ -625,7 +624,8 @@ impl Document {
} }
pub fn default(config: Arc<dyn DynAccess<Config>>) -> Self { pub fn default(config: Arc<dyn DynAccess<Config>>) -> Self {
let text = Rope::from(NATIVE_LINE_ENDING.as_str()); let line_ending: LineEnding = config.load().default_line_ending.into();
let text = Rope::from(line_ending.as_str());
Self::from(text, None, config) Self::from(text, None, config)
} }
@ -644,8 +644,9 @@ impl Document {
std::fs::File::open(path).context(format!("unable to open {:?}", path))?; std::fs::File::open(path).context(format!("unable to open {:?}", path))?;
from_reader(&mut file, encoding)? from_reader(&mut file, encoding)?
} else { } else {
let line_ending: LineEnding = config.load().default_line_ending.into();
let encoding = encoding.unwrap_or(encoding::UTF_8); let encoding = encoding.unwrap_or(encoding::UTF_8);
(Rope::from(NATIVE_LINE_ENDING.as_str()), encoding, false) (Rope::from(line_ending.as_str()), encoding, false)
}; };
let mut doc = Self::from(rope, Some((encoding, has_bom)), config); let mut doc = Self::from(rope, Some((encoding, has_bom)), config);
@ -1925,7 +1926,7 @@ mod test {
Document::default(Arc::new(ArcSwap::new(Arc::new(Config::default())))) Document::default(Arc::new(ArcSwap::new(Arc::new(Config::default()))))
.text() .text()
.to_string(), .to_string(),
NATIVE_LINE_ENDING.as_str() helix_core::NATIVE_LINE_ENDING.as_str()
); );
} }