@@ -245,76 +245,117 @@ impl View {
245245mod tests {
246246 use super::*;
247247 use helix_core::Rope;
248+ const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter
248249
249250 #[test]
250251 fn test_text_pos_at_screen_coords() {
251252 let mut view = View::new(DocumentId::default());
252253 view.area = Rect::new(40, 40, 40, 40);
253− let text = Rope::from_str("abc\n\tdef");
254+ let rope = Rope::from_str("abc\n\tdef");
255+ let text = rope.slice(..);
256+
257+ assert_eq!(view.text_pos_at_screen_coords(&text, 40, 2, 4), None);
258+
259+ assert_eq!(view.text_pos_at_screen_coords(&text, 40, 41, 4), None);
260+
261+ assert_eq!(view.text_pos_at_screen_coords(&text, 0, 2, 4), None);
262+
263+ assert_eq!(view.text_pos_at_screen_coords(&text, 0, 49, 4), None);
264+
265+ assert_eq!(view.text_pos_at_screen_coords(&text, 0, 41, 4), None);
266+
267+ assert_eq!(view.text_pos_at_screen_coords(&text, 40, 81, 4), None);
268+
269+ assert_eq!(view.text_pos_at_screen_coords(&text, 78, 41, 4), None);
254270
255271 assert_eq!(
256− view.text_pos_at_screen_coords(&text.slice(..), 40, 2, 4),
257− None
272+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 3, 4),
273+ Some(3)
258274 );
259275
276+ assert_eq!(view.text_pos_at_screen_coords(&text, 40, 80, 4), Some(3));
277+
260278 assert_eq!(
261− view.text_pos_at_screen_coords(&text.slice(..), 40, 41, 4),
262− None
279+ view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 1, 4),
280+ Some(5)
263281 );
264282
265283 assert_eq!(
266− view.text_pos_at_screen_coords(&text.slice(..), 0, 2, 4),
267− None
284+ view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 4, 4),
285+ Some(5)
268286 );
269287
270288 assert_eq!(
271− view.text_pos_at_screen_coords(&text.slice(..), 0, 49, 4),
272− None
289+ view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 7, 4),
290+ Some(8)
273291 );
274292
293+ assert_eq!(view.text_pos_at_screen_coords(&text, 41, 80, 4), Some(8));
294+ }
295+
296+ #[test]
297+ fn test_text_pos_at_screen_coords_cjk() {
298+ let mut view = View::new(DocumentId::default());
299+ view.area = Rect::new(40, 40, 40, 40);
300+ let rope = Rope::from_str("Hi! こんにちは皆さん");
301+ let text = rope.slice(..);
302+
275303 assert_eq!(
276− view.text_pos_at_screen_coords(&text.slice(..), 0, 41, 4),
277− None
304+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 0, 4),
305+ Some(0)
278306 );
279307
280308 assert_eq!(
281− view.text_pos_at_screen_coords(&text.slice(..), 40, 81, 4),
282− None
309+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 5, 4),
310+ Some(5)
283311 );
284312
285313 assert_eq!(
286− view.text_pos_at_screen_coords(&text.slice(..), 78, 41, 4),
287− None
314+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 6, 4),
315+ Some(5)
288316 );
289317
290318 assert_eq!(
291− view.text_pos_at_screen_coords(&text.slice(..), 40, 40 + 7 + 3, 4),
292− Some(3)
319+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 7, 4),
320+ Some(6)
293321 );
294322
295323 assert_eq!(
296− view.text_pos_at_screen_coords(&text.slice(..), 40, 80, 4),
297− Some(3)
324+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 8, 4),
325+ Some(6)
298326 );
327+ }
328+
329+ #[test]
330+ fn test_text_pos_at_screen_coords_graphemes() {
331+ let mut view = View::new(DocumentId::default());
332+ view.area = Rect::new(40, 40, 40, 40);
333+ let rope = Rope::from_str("Hèl̀l̀ò world!");
334+ let text = rope.slice(..);
299335
300336 assert_eq!(
301− view.text_pos_at_screen_coords(&text.slice(..), 41, 40 + 7 + 1, 4),
302− Some(5)
337+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 0, 4),
338+ Some(0)
303339 );
304340
305341 assert_eq!(
306− view.text_pos_at_screen_coords(&text.slice(..), 41, 40 + 7 + 4, 4),
307− Some(5)
342+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 1, 4),
343+ Some(1)
308344 );
309345
310346 assert_eq!(
311− view.text_pos_at_screen_coords(&text.slice(..), 41, 40 + 7 + 7, 4),
312− Some(8)
347+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 2, 4),
348+ Some(3)
313349 );
314350
315351 assert_eq!(
316− view.text_pos_at_screen_coords(&text.slice(..), 41, 80, 4),
317− Some(8)
352+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 3, 4),
353+ Some(5)
354+ );
355+
356+ assert_eq!(
357+ view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 4, 4),
358+ Some(7)
318359 );
319360 }
320361}