@@ -77,7 +77,7 @@ impl Editor {
7777
7878 // clear with background color
7979 self.surface
80− .set_style(area, view.theme.get("ui.background").into());
80+ .set_style(area, view.theme.get("ui.background"));
8181
8282 let offset = 5 + 1; // 5 linenr + 1 gutter
8383 let viewport = Rect::new(offset, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
@@ -143,16 +143,14 @@ impl Editor {
143143 // TODO: filter out spans out of viewport for now..
144144
145145 let start = view.state.doc().byte_to_char(start);
146− let end = view.state.doc().byte_to_char(end);
146+ let end = view.state.doc().byte_to_char(end); // <-- index 744, len 743
147147
148148 let text = view.state.doc().slice(start..end);
149149
150150 use helix_core::graphemes::{grapheme_width, RopeGraphemes};
151151
152152 let style = match spans.first() {
153− Some(span) => {
154− view.theme.get(view.theme.scopes()[span.0].as_str()).into()
155− }
153+ Some(span) => view.theme.get(view.theme.scopes()[span.0].as_str()),
156154 None => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender
157155 };
158156
@@ -209,7 +207,7 @@ impl Editor {
209207 }
210208 }
211209
212− let style: Style = view.theme.get("ui.linenr").into();
210+ let style: Style = view.theme.get("ui.linenr");
213211 for (i, line) in (view.first_line..(last_line as u16)).enumerate() {
214212 self.surface
215213 .set_stringn(0, line, format!("{:>5}", i + 1), 5, style);
@@ -248,7 +246,7 @@ impl Editor {
248246 };
249247 self.surface.set_style(
250248 Rect::new(0, self.size.1 - 1, self.size.0, 1),
251− view.theme.get("ui.statusline").into(),
249+ view.theme.get("ui.statusline"),
252250 );
253251 // TODO: unfocused one with different color
254252 let text_color = Style::default().fg(Color::Rgb(219, 191, 239)); // lilac
@@ -325,14 +323,12 @@ impl Editor {
325323 if let Some(command) = keymap[&Mode::Insert].get(&keys) {
326324 // TODO: handle count other than 1
327325 command(view, 1);
328− } else {
329− if let KeyEvent {
330− code: KeyCode::Char(c),
331− ..
332− } = event
333− {
334− commands::insert_char(view, c);
335− }
326+ } else if let KeyEvent {
327+ code: KeyCode::Char(c),
328+ ..
329+ } = event
330+ {
331+ commands::insert_char(view, c);
336332 }
337333 view.ensure_cursor_in_view();
338334