Commit41a0253

committed

Fix patterns of provide_context gets panicked

This PR fixes two cases where provide_context panics even thoughthe previous call of `is_boundary` returns a PreContext error.The primary cause is `provide_context` assumes its state asRegional or Emoji; otherwise it gets panicked with 'invalid state!'However:- if the chunk starts with the cursor position, it requires pre-context for `cat_before` (and that's necessary for some cases indeed). so provide_context should fill `cat_before` in such case.- if both `cat_before` and `cat_after` are RIS and the boundary is undecided by the chunk, it requires pre-context but it does not set its state to Regional. This is done by setting state within `handle_regional`.

1 parent611eaa7 commit41a0253Copy full SHA for 41a0253

File tree

1 file changed

+24

-1

lines changed

src
- grapheme.rs

1 file changed

+24

-1

lines changed

`‎src/grapheme.rs‎`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,10 @@ impl GraphemeCursor {`
`360`	`360`	`matchself.state{`
`361`	`361`	`GraphemeState::Regional =>self.handle_regional(chunk, chunk_start),`
`362`	`362`	`GraphemeState::Emoji =>self.handle_emoji(chunk, chunk_start),`
`363`		`- _ =>panic!("invalid state")`
	`363`	`+ _ =>ifself.cat_before.is_none() &&self.offset == chunk.len() + chunk_start{`
	`364`	`+let ch = chunk.chars().rev().next().unwrap();`
	`365`	`+self.cat_before =Some(gr::grapheme_category(ch));`
	`366`	`+},`
`364`	`367`	`}`
`365`	`368`	`}`
`366`	`369`
`@@ -406,6 +409,7 @@ impl GraphemeCursor {`
`406`	`409`	`return;`
`407`	`410`	`}`
`408`	`411`	`self.pre_context_offset =Some(chunk_start);`
	`412`	`+self.state =GraphemeState::Regional;`
`409`	`413`	`}`
`410`	`414`
`411`	`415`	`fnhandle_emoji(&mutself,chunk:&str,chunk_start:usize){`
`@@ -428,6 +432,7 @@ impl GraphemeCursor {`
`428`	`432`	`return;`
`429`	`433`	`}`
`430`	`434`	`self.pre_context_offset =Some(chunk_start);`
	`435`	`+self.state =GraphemeState::Emoji;`
`431`	`436`	`}`
`432`	`437`
`433`	`438`	`/// Determine whether the current cursor location is a grapheme cluster boundary.`
`@@ -659,3 +664,21 @@ impl GraphemeCursor {`
`659`	`664`	`}`
`660`	`665`	`}`
`661`	`666`	`}`
	`667`	`+`
	`668`	`+#[test]`
	`669`	`+fntest_grapheme_cursor_ris_precontext(){`
	`670`	`+let s ="\u{1f1fa}\u{1f1f8}\u{1f1fa}\u{1f1f8}\u{1f1fa}\u{1f1f8}";`
	`671`	`+letmut c =GraphemeCursor::new(8, s.len(),true);`
	`672`	`+assert_eq!(c.is_boundary(&s[4..],4),Err(GraphemeIncomplete::PreContext(4)));`
	`673`	`+ c.provide_context(&s[..4],0);`
	`674`	`+assert_eq!(c.is_boundary(&s[4..],4),Ok(true));`
	`675`	`+}`
	`676`	`+`
	`677`	`+#[test]`
	`678`	`+fntest_grapheme_cursor_chunk_start_require_precontext(){`
	`679`	`+let s ="\r\n";`
	`680`	`+letmut c =GraphemeCursor::new(1, s.len(),true);`
	`681`	`+assert_eq!(c.is_boundary(&s[1..],1),Err(GraphemeIncomplete::PreContext(1)));`
	`682`	`+ c.provide_context(&s[..1],0);`
	`683`	`+assert_eq!(c.is_boundary(&s[1..],1),Ok(false));`
	`684`	`+}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit41a0253

File tree

1 file changed

1 file changed

`‎src/grapheme.rs‎`

0 commit comments