TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove another parameter from render_view

Browse source
This commit is contained in:
Blaž Hrastnik 2021-12-01 01:07:25 +09:00
parent 84e939ef58
commit 96ae5897a1
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
helix-term/src/ui/editor.rs
View file

@ -59,7 +59,6 @@ impl EditorView {
&mut self.spinners &mut self.spinners
} }
#[allow(clippy::too_many_arguments)]
pub fn render_view( pub fn render_view(
&self, &self,
editor: &Editor, editor: &Editor,
@ -68,13 +67,13 @@ impl EditorView {
viewport: Rect, viewport: Rect,
surface: &mut Surface, surface: &mut Surface,
is_focused: bool, is_focused: bool,
loader: &syntax::Loader,
) { ) {
let inner = view.inner_area(); let inner = view.inner_area();
let area = view.area; let area = view.area;
let theme = &editor.theme; let theme = &editor.theme;
let highlights = Self::doc_syntax_highlights(doc, view.offset, inner.height, theme, loader); let highlights =
Self::doc_syntax_highlights(doc, view.offset, inner.height, theme, &editor.syn_loader);
let highlights = syntax::merge(highlights, Self::doc_diagnostics_highlights(doc, theme)); let highlights = syntax::merge(highlights, Self::doc_diagnostics_highlights(doc, theme));
let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused { let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
Box::new(syntax::merge( Box::new(syntax::merge(
@ -117,7 +116,6 @@ impl EditorView {
/// Get syntax highlights for a document in a view represented by the first line /// Get syntax highlights for a document in a view represented by the first line
/// and column (`offset`) and the last line. This is done instead of using a view /// and column (`offset`) and the last line. This is done instead of using a view
/// directly to enable rendering syntax highlighted docs anywhere (eg. picker preview) /// directly to enable rendering syntax highlighted docs anywhere (eg. picker preview)
#[allow(clippy::too_many_arguments)]
pub fn doc_syntax_highlights<'doc>( pub fn doc_syntax_highlights<'doc>(
doc: &'doc Document, doc: &'doc Document,
offset: Position, offset: Position,
@ -556,7 +554,6 @@ impl EditorView {
); );
} }
#[allow(clippy::too_many_arguments)]
pub fn render_statusline( pub fn render_statusline(
&self, &self,
doc: &Document, doc: &Document,
@ -1154,8 +1151,7 @@ impl Component for EditorView {
for (view, is_focused) in cx.editor.tree.views() { for (view, is_focused) in cx.editor.tree.views() {
let doc = cx.editor.document(view.doc).unwrap(); let doc = cx.editor.document(view.doc).unwrap();
let loader = &cx.editor.syn_loader; self.render_view(cx.editor, doc, view, area, surface, is_focused);
self.render_view(cx.editor, doc, view, area, surface, is_focused, loader);
} }
if cx.editor.config.auto_info { if cx.editor.config.auto_info {