a9a718c · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

added some tests and a line_ending helper function in document.rs

a9a718cJan Hrastnik5 years ago

helix-core/src/lib.rs+1−1

compare with master

unifiedsplit

@@ -110,5 +110,5 @@ pub use syntax::Syntax;

110pub use diagnostic::Diagnostic;

111pub use state::State;

112

113−pub use line_ending::{auto_detect_line_ending, DEFAULT_LINE_ENDING, LineEnding};

113+pub use line_ending::{auto_detect_line_ending, LineEnding, DEFAULT_LINE_ENDING};

114pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};

helix-core/src/line_ending.rs+60−4

@@ -1,7 +1,6 @@

1use crate::{Rope, RopeGraphemes, RopeSlice};

3/// Represents one of the valid Unicode line endings.

4−/// VT, FF and PS are excluded here, as we don't expect them to show up as a default line break

5#[derive(PartialEq, Copy, Clone, Debug)]

4#[derive(PartialEq, Copy, Clone, Debug)]

6pub enum LineEnding {

5pub enum LineEnding {

7 Crlf, // CarriageReturn followed by LineFeed

6 Crlf, // CarriageReturn followed by LineFeed

@@ -9,6 +8,9 @@ pub enum LineEnding {

9 CR, // U+000D -- CarriageReturn

8 CR, // U+000D -- CarriageReturn

10 Nel, // U+0085 -- NextLine

9 Nel, // U+0085 -- NextLine

11 LS, // U+2028 -- Line Separator

10 LS, // U+2028 -- Line Separator

11+ VT, // U+000B -- VerticalTab

12+ FF, // U+000C -- FormFeed

13+ PS, // U+2029 -- ParagraphSeparator

12}

14}

14pub fn rope_slice_to_line_ending(g: &RopeSlice) -> Option<LineEnding> {

16pub fn rope_slice_to_line_ending(g: &RopeSlice) -> Option<LineEnding> {

@@ -38,8 +40,8 @@ pub fn auto_detect_line_ending(doc: &Rope) -> Option<LineEnding> {

38 // based on https://github.com/cessen/led/blob/27572c8838a1c664ee378a19358604063881cc1d/src/editor/mod.rs#L88-L162

40 // based on https://github.com/cessen/led/blob/27572c8838a1c664ee378a19358604063881cc1d/src/editor/mod.rs#L88-L162

40 let mut ending = None;

42 let mut ending = None;

43+ // return first matched line ending. Not all possible line endings are being matched, as they might be special-use only

41− for line in doc.lines().take(1) {

44+ for line in doc.lines().take(100) {

42− // check first line only - unsure how sound this is

43 ending = match line.len_chars() {

45 ending = match line.len_chars() {

44 1 => {

46 1 => {

45 let g = RopeGraphemes::new(line.slice((line.len_chars() - 1)..))

47 let g = RopeGraphemes::new(line.slice((line.len_chars() - 1)..))

@@ -54,6 +56,9 @@ pub fn auto_detect_line_ending(doc: &Rope) -> Option<LineEnding> {

54 rope_slice_to_line_ending(&g)

56 rope_slice_to_line_ending(&g)

55 }

57 }

56 _ => None,

58 _ => None,

59+ };

60+ if ending.is_some() {

61+ return ending;

57 }

62 }

58 }

63 }

59 ending

64 ending

@@ -62,4 +67,55 @@ pub fn auto_detect_line_ending(doc: &Rope) -> Option<LineEnding> {

62#[cfg(target_os = "windows")]

67#[cfg(target_os = "windows")]

63pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;

68pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;

64#[cfg(not(target_os = "windows"))]

69#[cfg(not(target_os = "windows"))]

65−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;

70+pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;

71+

72+#[cfg(test)]

73+mod line_ending_tests {

74+ use super::*;

75+

76+ #[test]

77+ fn test_autodetect() {

78+ assert_eq!(

79+ auto_detect_line_ending(&Rope::from_str("\n")),

80+ Some(LineEnding::LF)

81+ );

82+ assert_eq!(

83+ auto_detect_line_ending(&Rope::from_str("\r\n")),

84+ Some(LineEnding::Crlf)

85+ );

86+ assert_eq!(auto_detect_line_ending(&Rope::from_str("hello")), None);

87+ assert_eq!(auto_detect_line_ending(&Rope::from_str("")), None);

88+ assert_eq!(

89+ auto_detect_line_ending(&Rope::from_str("hello\nhelix\r\n")),

90+ Some(LineEnding::LF)

91+ );

92+ assert_eq!(

93+ auto_detect_line_ending(&Rope::from_str("a formfeed\u{000C}")),

94+ None

95+ );

96+ assert_eq!(

97+ auto_detect_line_ending(&Rope::from_str("\n\u{000A}\n \u{000A}")),

98+ Some(LineEnding::LF)

99+ );

100+ assert_eq!(

101+ auto_detect_line_ending(&Rope::from_str(

102+ "a formfeed\u{000C} with a\u{000C} linefeed\u{000A}"

103+ )),

104+ Some(LineEnding::LF)

105+ );

106+ assert_eq!(auto_detect_line_ending(&Rope::from_str("a formfeed\u{000C} with a\u{000C} carriage return linefeed\u{000D}\u{000A} and a linefeed\u{000A}")), Some(LineEnding::Crlf));

107+ }

108+

109+ #[test]

110+ fn test_rope_slice_to_line_ending() {

111+ let r = Rope::from_str("\r\n");

112+ assert_eq!(

113+ rope_slice_to_line_ending(&r.slice(1..2)),

114+ Some(LineEnding::LF)

115+ );

116+ assert_eq!(

117+ rope_slice_to_line_ending(&r.slice(0..2)),

118+ Some(LineEnding::Crlf)

119+ );

120+ }

121+}

helix-view/src/document.rs+15−1

@@ -6,9 +6,9 @@ use std::sync::Arc;

7use helix_core::{

8 chars::{char_is_linebreak, char_is_whitespace},

9− auto_detect_line_ending, DEFAULT_LINE_ENDING, history::History,

10 syntax::{LanguageConfiguration, LOADER},

9 syntax::{LanguageConfiguration, LOADER},

11 ChangeSet, Diagnostic, LineEnding, Rope, Selection, State, Syntax, Transaction,

10 ChangeSet, Diagnostic, LineEnding, Rope, Selection, State, Syntax, Transaction,

11+ DEFAULT_LINE_ENDING,

12};

14use crate::{DocumentId, ViewId};

@@ -740,6 +740,20 @@ impl Document {

740 pub fn set_diagnostics(&mut self, diagnostics: Vec<Diagnostic>) {

741 self.diagnostics = diagnostics;

742 }

743+

744+ pub fn line_ending(&self) -> &str {

745+ match self.line_ending {

746+ LineEnding::Crlf => "\u{000D}\u{000A}",

747+ LineEnding::LF => "\u{000A}",

748+ LineEnding::Nel => "\u{0085}",

749+ LineEnding::LS => "\u{2028}",

750+ LineEnding::CR => "\u{000D}",

751+ _ => panic!(

752+ "Unexpected line ending: {:?}, expected Crlf, LF, CR, Nel, or LS.",

753+ self.line_ending

754+ ),

755+ }

756+ }

743}

757}

744

758

745#[cfg(test)]

759#[cfg(test)]