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

fix formatting

Browse Source
pull/8675/merge^2
mattwparas 1 year ago
parent 42c9997487
commit fe4d6ceb40
3 changed files with 616 additions and 620 deletions
Show Stats Download Patch File Download Diff File

3
helix-term/src/commands.rs
Unescape Escape View File

@ -3550,9 +3550,8 @@ pub mod insert {
indent, indent,
); );
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
} }
pub fn smart_tab(cx: &mut Context) { pub fn smart_tab(cx: &mut Context) {
let (view, doc) = current_ref!(cx.editor); let (view, doc) = current_ref!(cx.editor);
let view_id = view.id; let view_id = view.id;

1176
helix-term/src/commands/typed.rs
View File

File diff suppressed because it is too large Load Diff

57
helix-term/src/ui/document.rs
Unescape Escape View File

@ -6,7 +6,7 @@ use helix_core::str_utils::char_to_byte_idx;
use helix_core::syntax::Highlight; use helix_core::syntax::Highlight;
use helix_core::syntax::HighlightEvent; use helix_core::syntax::HighlightEvent;
use helix_core::text_annotations::TextAnnotations; use helix_core::text_annotations::TextAnnotations;
use helix_core::{visual_offset_from_block, Position, RopeSlice, Range}; use helix_core::{visual_offset_from_block, Position, Range, RopeSlice};
use helix_view::editor::{WhitespaceConfig, WhitespaceRenderValue}; use helix_view::editor::{WhitespaceConfig, WhitespaceRenderValue};
use helix_view::graphics::Rect; use helix_view::graphics::Rect;
use helix_view::theme::Style; use helix_view::theme::Style;
@ -73,7 +73,6 @@ impl<H: Iterator<Item = HighlightEvent>> Iterator for StyleIter<'_, H> {
} }
} }
/// A wrapper around a HighlightIterator /// A wrapper around a HighlightIterator
/// that merges the layered highlights to create the final text style /// that merges the layered highlights to create the final text style
/// and yields the active text style and the char_idx where the active /// and yields the active text style and the char_idx where the active
@ -89,33 +88,32 @@ impl<H: Iterator<Item = (Range, Style)>> Iterator for RawStyleIter<'_, H> {
type Item = (Style, usize); type Item = (Style, usize);
fn next(&mut self) -> Option<(Style, usize)> { fn next(&mut self) -> Option<(Style, usize)> {
while let Some(event) = self.highlight_iter.next() { while let Some(event) = self.highlight_iter.next() {
// let style = self.active_highlights.iter().fold(self.text_style, |acc, span| { // let style = self.active_highlights.iter().fold(self.text_style, |acc, span| {
// acc.patch(event.1) // acc.patch(event.1)
// }); // });
return Some((self.text_style.patch(event.1), event.0.head)) return Some((self.text_style.patch(event.1), event.0.head));
// match event { // match event {
// HighlightEvent::HighlightStart(highlights) => { // HighlightEvent::HighlightStart(highlights) => {
// self.active_highlights.push(highlights) // self.active_highlights.push(highlights)
// } // }
// HighlightEvent::HighlightEnd => { // HighlightEvent::HighlightEnd => {
// self.active_highlights.pop(); // self.active_highlights.pop();
// } // }
// HighlightEvent::Source { start, end } => { // HighlightEvent::Source { start, end } => {
// if start == end { // if start == end {
// continue; // continue;
// } // }
// let style = self // let style = self
// .active_highlights // .active_highlights
// .iter() // .iter()
// .fold(self.text_style, |acc, span| { // .fold(self.text_style, |acc, span| {
// acc.patch(self.theme.highlight(span.0)) // acc.patch(self.theme.highlight(span.0))
// }); // });
// return Some((style, end)); // return Some((style, end));
// } // }
// } // }
} }
None None
@ -231,7 +229,7 @@ pub fn render_text<'t>(
let (mut formatter, mut first_visible_char_idx) = let (mut formatter, mut first_visible_char_idx) =
DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor); DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
let mut styles = StyleIter { let mut styles = StyleIter {
text_style: renderer.text_style, text_style: renderer.text_style,
active_highlights: Vec::with_capacity(64), active_highlights: Vec::with_capacity(64),
@ -364,7 +362,7 @@ pub fn render_text<'t>(
// } // }
// { // {
// let ( // let (
// Position { // Position {
// row: mut row_off, .. // row: mut row_off, ..
@ -381,7 +379,7 @@ pub fn render_text<'t>(
// let (mut formatter, mut first_visible_char_idx) = // let (mut formatter, mut first_visible_char_idx) =
// DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor); // DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
// let mut styles = RawStyleIter { // let mut styles = RawStyleIter {
// text_style: renderer.text_style, // text_style: renderer.text_style,
// active_highlights: Vec::with_capacity(64), // active_highlights: Vec::with_capacity(64),
@ -433,7 +431,7 @@ pub fn render_text<'t>(
// renderer, // renderer,
// last_pos, // last_pos,
// ); // );
// } // }
// break; // break;
// }; // };
@ -518,9 +516,8 @@ pub fn render_text<'t>(
// renderer.draw_indent_guides(last_line_indent_level, last_line_pos.visual_line); // renderer.draw_indent_guides(last_line_indent_level, last_line_pos.visual_line);
// for line_decoration in &mut *line_decorations { // for line_decoration in &mut *line_decorations {
// line_decoration.render_foreground(renderer, last_line_pos, char_pos); // line_decoration.render_foreground(renderer, last_line_pos, char_pos);
// } // }
// } // }
} }
#[derive(Debug)] #[derive(Debug)]

Write Preview
Loading…
Cancel
Save