Merge branch 'master' into great_line_ending_and_cursor_range_cleanup

pull/376/head
Nathan Vegdahl 3 years ago
commit 2224a1527e

@ -139,7 +139,7 @@ fn handle_close(doc: &Rope, selection: &Selection, _open: char, close: char) ->
} }
// handle cases where open and close is the same, or in triples ("""docstring""") // handle cases where open and close is the same, or in triples ("""docstring""")
fn handle_same(doc: &Rope, selection: &Selection, token: char) -> Option<Transaction> { fn handle_same(_doc: &Rope, _selection: &Selection, _token: char) -> Option<Transaction> {
// if not cursor but selection, wrap // if not cursor but selection, wrap
// let next = next char // let next = next char

@ -1,7 +1,6 @@
use crate::{ChangeSet, Rope, State, Transaction}; use crate::{ChangeSet, Rope, State, Transaction};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use smallvec::{smallvec, SmallVec};
use std::num::NonZeroUsize; use std::num::NonZeroUsize;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
@ -127,7 +126,6 @@ impl History {
let last_child = current_revision.last_child?; let last_child = current_revision.last_child?;
self.current = last_child.get(); self.current = last_child.get();
let last_child_revision = &self.revisions[last_child.get()];
Some(&self.revisions[last_child.get()].transaction) Some(&self.revisions[last_child.get()].transaction)
} }
@ -377,21 +375,21 @@ mod test {
if let Some(transaction) = history.undo() { if let Some(transaction) = history.undo() {
transaction.apply(&mut state.doc); transaction.apply(&mut state.doc);
} }
}; }
fn earlier(history: &mut History, state: &mut State, uk: UndoKind) { fn earlier(history: &mut History, state: &mut State, uk: UndoKind) {
let txns = history.earlier(uk); let txns = history.earlier(uk);
for txn in txns { for txn in txns {
txn.apply(&mut state.doc); txn.apply(&mut state.doc);
} }
}; }
fn later(history: &mut History, state: &mut State, uk: UndoKind) { fn later(history: &mut History, state: &mut State, uk: UndoKind) {
let txns = history.later(uk); let txns = history.later(uk);
for txn in txns { for txn in txns {
txn.apply(&mut state.doc); txn.apply(&mut state.doc);
} }
}; }
fn commit_change( fn commit_change(
history: &mut History, history: &mut History,
@ -402,7 +400,7 @@ mod test {
let txn = Transaction::change(&state.doc, vec![change.clone()].into_iter()); let txn = Transaction::change(&state.doc, vec![change.clone()].into_iter());
history.commit_revision_at_timestamp(&txn, &state, instant); history.commit_revision_at_timestamp(&txn, &state, instant);
txn.apply(&mut state.doc); txn.apply(&mut state.doc);
}; }
let t0 = Instant::now(); let t0 = Instant::now();
let t = |n| t0.checked_add(Duration::from_secs(n)).unwrap(); let t = |n| t0.checked_add(Duration::from_secs(n)).unwrap();

@ -1,13 +1,13 @@
use crate::{ use crate::{
find_first_non_whitespace_char, find_first_non_whitespace_char,
syntax::{IndentQuery, LanguageConfiguration, Syntax}, syntax::{IndentQuery, LanguageConfiguration, Syntax},
tree_sitter::{Node, Tree}, tree_sitter::Node,
Rope, RopeSlice, RopeSlice,
}; };
/// To determine indentation of a newly inserted line, figure out the indentation at the last col /// To determine indentation of a newly inserted line, figure out the indentation at the last col
/// of the previous line. /// of the previous line.
#[allow(dead_code)]
fn indent_level_for_line(line: RopeSlice, tab_width: usize) -> usize { fn indent_level_for_line(line: RopeSlice, tab_width: usize) -> usize {
let mut len = 0; let mut len = 0;
for ch in line.chars() { for ch in line.chars() {
@ -98,12 +98,13 @@ fn calculate_indentation(query: &IndentQuery, node: Option<Node>, newline: bool)
increment as usize increment as usize
} }
#[allow(dead_code)]
fn suggested_indent_for_line( fn suggested_indent_for_line(
language_config: &LanguageConfiguration, language_config: &LanguageConfiguration,
syntax: Option<&Syntax>, syntax: Option<&Syntax>,
text: RopeSlice, text: RopeSlice,
line_num: usize, line_num: usize,
tab_width: usize, _tab_width: usize,
) -> usize { ) -> usize {
if let Some(start) = find_first_non_whitespace_char(text.line(line_num)) { if let Some(start) = find_first_non_whitespace_char(text.line(line_num)) {
return suggested_indent_for_pos( return suggested_indent_for_pos(
@ -150,6 +151,7 @@ pub fn suggested_indent_for_pos(
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use crate::Rope;
#[test] #[test]
fn test_indent_level() { fn test_indent_level() {

@ -1,4 +1,3 @@
#![allow(unused)]
pub mod auto_pairs; pub mod auto_pairs;
pub mod chars; pub mod chars;
pub mod comment; pub mod comment;

@ -1,4 +1,4 @@
use crate::{Rope, RopeGraphemes, RopeSlice}; use crate::{Rope, RopeSlice};
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf; pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;

@ -1,4 +1,4 @@
use crate::{Range, Rope, Selection, Syntax}; use crate::{Rope, Syntax};
const PAIRS: &[(char, char)] = &[('(', ')'), ('{', '}'), ('[', ']'), ('<', '>')]; const PAIRS: &[(char, char)] = &[('(', ')'), ('{', '}'), ('[', ']'), ('<', '>')];
// limit matching pairs to only ( ) { } [ ] < > // limit matching pairs to only ( ) { } [ ] < >
@ -12,7 +12,7 @@ pub fn find(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
// most naive implementation: find the innermost syntax node, if we're at the edge of a node, // most naive implementation: find the innermost syntax node, if we're at the edge of a node,
// return the other edge. // return the other edge.
let mut node = match tree let node = match tree
.root_node() .root_node()
.named_descendant_for_byte_range(byte_pos, byte_pos) .named_descendant_for_byte_range(byte_pos, byte_pos)
{ {

@ -1,12 +1,9 @@
use std::iter::{self, from_fn, Peekable, SkipWhile}; use std::iter::{self, from_fn};
use ropey::iter::Chars; use ropey::iter::Chars;
use crate::{ use crate::{
chars::{ chars::{categorize_char, char_is_line_ending, CharCategory},
categorize_char, char_is_line_ending, char_is_punctuation, char_is_whitespace,
char_is_word, CharCategory,
},
coords_at_pos, coords_at_pos,
graphemes::{nth_next_grapheme_boundary, nth_prev_grapheme_boundary}, graphemes::{nth_next_grapheme_boundary, nth_prev_grapheme_boundary},
line_ending::{get_line_ending, line_end_char_index}, line_ending::{get_line_ending, line_end_char_index},
@ -116,7 +113,7 @@ pub fn move_prev_long_word_start(slice: RopeSlice, range: Range, count: usize) -
word_move(slice, range, count, WordMotionTarget::PrevLongWordStart) word_move(slice, range, count, WordMotionTarget::PrevLongWordStart)
} }
fn word_move(slice: RopeSlice, mut range: Range, count: usize, target: WordMotionTarget) -> Range { fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
(0..count).fold(range, |range, _| { (0..count).fold(range, |range, _| {
slice.chars_at(range.head).range_to_target(target, range) slice.chars_at(range.head).range_to_target(target, range)
}) })
@ -182,7 +179,6 @@ enum WordMotionPhase {
impl CharHelpers for Chars<'_> { impl CharHelpers for Chars<'_> {
fn range_to_target(&mut self, target: WordMotionTarget, origin: Range) -> Range { fn range_to_target(&mut self, target: WordMotionTarget, origin: Range) -> Range {
let range = origin;
// Characters are iterated forward or backwards depending on the motion direction. // Characters are iterated forward or backwards depending on the motion direction.
let characters: Box<dyn Iterator<Item = char>> = match target { let characters: Box<dyn Iterator<Item = char>> = match target {
WordMotionTarget::PrevWordStart | WordMotionTarget::PrevLongWordStart => { WordMotionTarget::PrevWordStart | WordMotionTarget::PrevLongWordStart => {
@ -270,20 +266,20 @@ fn reached_target(target: WordMotionTarget, peek: char, next_peek: Option<&char>
match target { match target {
WordMotionTarget::NextWordStart => { WordMotionTarget::NextWordStart => {
(is_word_boundary(peek, *next_peek) is_word_boundary(peek, *next_peek)
&& (char_is_line_ending(*next_peek) || !next_peek.is_whitespace())) && (char_is_line_ending(*next_peek) || !next_peek.is_whitespace())
} }
WordMotionTarget::NextWordEnd | WordMotionTarget::PrevWordStart => { WordMotionTarget::NextWordEnd | WordMotionTarget::PrevWordStart => {
(is_word_boundary(peek, *next_peek) is_word_boundary(peek, *next_peek)
&& (!peek.is_whitespace() || char_is_line_ending(*next_peek))) && (!peek.is_whitespace() || char_is_line_ending(*next_peek))
} }
WordMotionTarget::NextLongWordStart => { WordMotionTarget::NextLongWordStart => {
(is_long_word_boundary(peek, *next_peek) is_long_word_boundary(peek, *next_peek)
&& (char_is_line_ending(*next_peek) || !next_peek.is_whitespace())) && (char_is_line_ending(*next_peek) || !next_peek.is_whitespace())
} }
WordMotionTarget::NextLongWordEnd | WordMotionTarget::PrevLongWordStart => { WordMotionTarget::NextLongWordEnd | WordMotionTarget::PrevLongWordStart => {
(is_long_word_boundary(peek, *next_peek) is_long_word_boundary(peek, *next_peek)
&& (!peek.is_whitespace() || char_is_line_ending(*next_peek))) && (!peek.is_whitespace() || char_is_line_ending(*next_peek))
} }
} }
} }

@ -1,5 +1,4 @@
use crate::{Range, RopeSlice, Selection, Syntax}; use crate::{Range, RopeSlice, Selection, Syntax};
use smallvec::smallvec;
// TODO: to contract_selection we'd need to store the previous ranges before expand. // TODO: to contract_selection we'd need to store the previous ranges before expand.
// Maybe just contract to the first child node? // Maybe just contract to the first child node?

@ -1,7 +1,7 @@
use crate::{ use crate::{
chars::char_is_line_ending, chars::char_is_line_ending,
graphemes::{nth_next_grapheme_boundary, RopeGraphemes}, graphemes::{nth_next_grapheme_boundary, RopeGraphemes},
Rope, RopeSlice, RopeSlice,
}; };
/// Represents a single point in a text buffer. Zero indexed. /// Represents a single point in a text buffer. Zero indexed.
@ -70,6 +70,7 @@ pub fn pos_at_coords(text: RopeSlice, coords: Position) -> usize {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use crate::Rope;
#[test] #[test]
fn test_ordering() { fn test_ordering() {
@ -79,8 +80,8 @@ mod test {
#[test] #[test]
fn test_coords_at_pos() { fn test_coords_at_pos() {
let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ"); // let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
let slice = text.slice(..); // let slice = text.slice(..);
// assert_eq!(coords_at_pos(slice, 0), (0, 0).into()); // assert_eq!(coords_at_pos(slice, 0), (0, 0).into());
// assert_eq!(coords_at_pos(slice, 5), (0, 5).into()); // position on \n // assert_eq!(coords_at_pos(slice, 5), (0, 5).into()); // position on \n
// assert_eq!(coords_at_pos(slice, 6), (1, 0).into()); // position on w // assert_eq!(coords_at_pos(slice, 6), (1, 0).into()); // position on w

@ -6,7 +6,7 @@ use crate::{
graphemes::{ graphemes::{
ensure_grapheme_boundary_next, ensure_grapheme_boundary_prev, next_grapheme_boundary, ensure_grapheme_boundary_next, ensure_grapheme_boundary_prev, next_grapheme_boundary,
}, },
Assoc, ChangeSet, Rope, RopeSlice, Assoc, ChangeSet, RopeSlice,
}; };
use smallvec::{smallvec, SmallVec}; use smallvec::{smallvec, SmallVec};
use std::borrow::Cow; use std::borrow::Cow;
@ -426,10 +426,8 @@ pub fn select_on_matches(
// TODO: can't avoid occasional allocations since Regex can't operate on chunks yet // TODO: can't avoid occasional allocations since Regex can't operate on chunks yet
let fragment = sel.fragment(text); let fragment = sel.fragment(text);
let mut sel_start = sel.from(); let sel_start = sel.from();
let sel_end = sel.to(); let start_byte = text.char_to_byte(sel_start);
let mut start_byte = text.char_to_byte(sel_start);
for mat in regex.find_iter(&fragment) { for mat in regex.find_iter(&fragment) {
// TODO: retain range direction // TODO: retain range direction
@ -466,10 +464,10 @@ pub fn split_on_matches(
// TODO: can't avoid occasional allocations since Regex can't operate on chunks yet // TODO: can't avoid occasional allocations since Regex can't operate on chunks yet
let fragment = sel.fragment(text); let fragment = sel.fragment(text);
let mut sel_start = sel.from(); let sel_start = sel.from();
let sel_end = sel.to(); let sel_end = sel.to();
let mut start_byte = text.char_to_byte(sel_start); let start_byte = text.char_to_byte(sel_start);
let mut start = sel_start; let mut start = sel_start;
@ -492,11 +490,12 @@ pub fn split_on_matches(
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use crate::Rope;
#[test] #[test]
#[should_panic] #[should_panic]
fn test_new_empty() { fn test_new_empty() {
let sel = Selection::new(smallvec![], 0); let _ = Selection::new(smallvec![], 0);
} }
#[test] #[test]

@ -1,4 +1,10 @@
use crate::{chars::char_is_line_ending, regex::Regex, Change, Rope, RopeSlice, Transaction}; use crate::{
chars::char_is_line_ending,
regex::Regex,
transaction::{ChangeSet, Operation},
Rope, RopeSlice, Tendril,
};
pub use helix_syntax::{get_language, get_language_name, Lang}; pub use helix_syntax::{get_language, get_language_name, Lang};
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
@ -8,7 +14,7 @@ use std::{
cell::RefCell, cell::RefCell,
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
fmt, fmt,
path::{Path, PathBuf}, path::Path,
sync::Arc, sync::Arc,
}; };
@ -160,7 +166,7 @@ impl LanguageConfiguration {
None None
} else { } else {
let language = get_language(self.language_id); let language = get_language(self.language_id);
let mut config = HighlightConfiguration::new( let config = HighlightConfiguration::new(
language, language,
&highlights_query, &highlights_query,
&injections_query, &injections_query,
@ -326,7 +332,8 @@ impl Syntax {
// update root layer // update root layer
PARSER.with(|ts_parser| { PARSER.with(|ts_parser| {
syntax.root_layer.parse( // TODO: handle the returned `Result` properly.
let _ = syntax.root_layer.parse(
&mut ts_parser.borrow_mut(), &mut ts_parser.borrow_mut(),
&syntax.config, &syntax.config,
source, source,
@ -381,7 +388,7 @@ impl Syntax {
source: RopeSlice<'a>, source: RopeSlice<'a>,
range: Option<std::ops::Range<usize>>, range: Option<std::ops::Range<usize>>,
cancellation_flag: Option<&'a AtomicUsize>, cancellation_flag: Option<&'a AtomicUsize>,
mut injection_callback: impl FnMut(&str) -> Option<&'a HighlightConfiguration> + 'a, injection_callback: impl FnMut(&str) -> Option<&'a HighlightConfiguration> + 'a,
) -> impl Iterator<Item = Result<HighlightEvent, Error>> + 'a { ) -> impl Iterator<Item = Result<HighlightEvent, Error>> + 'a {
// The `captures` iterator borrows the `Tree` and the `QueryCursor`, which // The `captures` iterator borrows the `Tree` and the `QueryCursor`, which
// prevents them from being moved. But both of these values are really just // prevents them from being moved. But both of these values are really just
@ -473,12 +480,6 @@ pub struct LanguageLayer {
pub(crate) tree: Option<Tree>, pub(crate) tree: Option<Tree>,
} }
use crate::{
coords_at_pos,
transaction::{ChangeSet, Operation},
Tendril,
};
impl LanguageLayer { impl LanguageLayer {
// pub fn new() -> Self { // pub fn new() -> Self {
// Self { tree: None } // Self { tree: None }
@ -494,8 +495,8 @@ impl LanguageLayer {
ts_parser: &mut TsParser, ts_parser: &mut TsParser,
config: &HighlightConfiguration, config: &HighlightConfiguration,
source: &Rope, source: &Rope,
mut depth: usize, _depth: usize,
mut ranges: Vec<Range>, ranges: Vec<Range>,
) -> Result<(), Error> { ) -> Result<(), Error> {
if ts_parser.parser.set_included_ranges(&ranges).is_ok() { if ts_parser.parser.set_included_ranges(&ranges).is_ok() {
ts_parser ts_parser
@ -566,7 +567,6 @@ impl LanguageLayer {
) -> Vec<tree_sitter::InputEdit> { ) -> Vec<tree_sitter::InputEdit> {
use Operation::*; use Operation::*;
let mut old_pos = 0; let mut old_pos = 0;
let mut new_pos = 0;
let mut edits = Vec::new(); let mut edits = Vec::new();
@ -610,9 +610,7 @@ impl LanguageLayer {
let mut old_end = old_pos + len; let mut old_end = old_pos + len;
match change { match change {
Retain(_) => { Retain(_) => {}
new_pos += len;
}
Delete(_) => { Delete(_) => {
let (start_byte, start_position) = point_at_pos(old_text, old_pos); let (start_byte, start_position) = point_at_pos(old_text, old_pos);
let (old_end_byte, old_end_position) = point_at_pos(old_text, old_end); let (old_end_byte, old_end_position) = point_at_pos(old_text, old_end);
@ -636,8 +634,6 @@ impl LanguageLayer {
Insert(s) => { Insert(s) => {
let (start_byte, start_position) = point_at_pos(old_text, old_pos); let (start_byte, start_position) = point_at_pos(old_text, old_pos);
let ins = s.chars().count();
// a subsequent delete means a replace, consume it // a subsequent delete means a replace, consume it
if let Some(Delete(len)) = iter.peek() { if let Some(Delete(len)) = iter.peek() {
old_end = old_pos + len; old_end = old_pos + len;
@ -665,8 +661,6 @@ impl LanguageLayer {
new_end_position: traverse(start_position, s), // old pos + chars, newlines matter too (iter over) new_end_position: traverse(start_position, s), // old pos + chars, newlines matter too (iter over)
}); });
} }
new_pos += ins;
} }
} }
old_pos = old_end; old_pos = old_end;
@ -1480,7 +1474,6 @@ where
// local scope at the top of the scope stack. // local scope at the top of the scope stack.
else if Some(capture.index) == layer.config.local_def_capture_index { else if Some(capture.index) == layer.config.local_def_capture_index {
reference_highlight = None; reference_highlight = None;
definition_highlight = None;
let scope = layer.scope_stack.last_mut().unwrap(); let scope = layer.scope_stack.last_mut().unwrap();
let mut value_range = 0..0; let mut value_range = 0..0;
@ -1644,13 +1637,13 @@ fn injection_for_match<'a>(
(language_name, content_node, include_children) (language_name, content_node, include_children)
} }
fn shrink_and_clear<T>(vec: &mut Vec<T>, capacity: usize) { // fn shrink_and_clear<T>(vec: &mut Vec<T>, capacity: usize) {
if vec.len() > capacity { // if vec.len() > capacity {
vec.truncate(capacity); // vec.truncate(capacity);
vec.shrink_to_fit(); // vec.shrink_to_fit();
} // }
vec.clear(); // vec.clear();
} // }
pub struct Merge<I> { pub struct Merge<I> {
iter: I, iter: I,
@ -1691,7 +1684,7 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
loop { loop {
match (self.next_event, &self.next_span) { match (self.next_event, &self.next_span) {
// this happens when range is partially or fully offscreen // this happens when range is partially or fully offscreen
(Some(Source { start, end }), Some((span, range))) if start > range.start => { (Some(Source { start, .. }), Some((span, range))) if start > range.start => {
if start > range.end { if start > range.end {
self.next_span = self.spans.next(); self.next_span = self.spans.next();
} else { } else {
@ -1711,7 +1704,7 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
self.next_event = self.iter.next(); self.next_event = self.iter.next();
Some(HighlightEnd) Some(HighlightEnd)
} }
(Some(Source { start, end }), Some((span, range))) if start < range.start => { (Some(Source { start, end }), Some((_, range))) if start < range.start => {
let intersect = range.start.min(end); let intersect = range.start.min(end);
let event = Source { let event = Source {
start, start,
@ -1766,7 +1759,7 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
Some(event) Some(event)
} }
// can happen if deleting and cursor at EOF, and diagnostic reaches past the end // can happen if deleting and cursor at EOF, and diagnostic reaches past the end
(None, Some((span, range))) => { (None, Some((_, _))) => {
self.next_span = None; self.next_span = None;
None None
} }
@ -1776,6 +1769,11 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
} }
} }
#[cfg(test)]
mod test {
use super::*;
use crate::{Rope, Transaction};
#[test] #[test]
fn test_parser() { fn test_parser() {
let highlight_names: Vec<String> = [ let highlight_names: Vec<String> = [
@ -1804,7 +1802,7 @@ fn test_parser() {
.collect(); .collect();
let language = get_language(Lang::Rust); let language = get_language(Lang::Rust);
let mut config = HighlightConfiguration::new( let config = HighlightConfiguration::new(
language, language,
&std::fs::read_to_string( &std::fs::read_to_string(
"../helix-syntax/languages/tree-sitter-rust/queries/highlights.scm", "../helix-syntax/languages/tree-sitter-rust/queries/highlights.scm",
@ -1848,7 +1846,7 @@ fn test_input_edits() {
use crate::State; use crate::State;
use tree_sitter::InputEdit; use tree_sitter::InputEdit;
let mut state = State::new("hello world!\ntest 123".into()); let state = State::new("hello world!\ntest 123".into());
let transaction = Transaction::change( let transaction = Transaction::change(
&state.doc, &state.doc,
vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(), vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
@ -1908,3 +1906,4 @@ fn test_load_runtime_file() {
let results = load_runtime_file("rust", "does-not-exist"); let results = load_runtime_file("rust", "does-not-exist");
assert!(results.is_err()); assert!(results.is_err());
} }
}

@ -1,5 +1,5 @@
use crate::{Range, Rope, Selection, State, Tendril}; use crate::{Range, Rope, Selection, Tendril};
use std::{borrow::Cow, convert::TryFrom}; use std::borrow::Cow;
/// (from, to, replacement) /// (from, to, replacement)
pub type Change = (usize, usize, Option<Tendril>); pub type Change = (usize, usize, Option<Tendril>);
@ -163,7 +163,7 @@ impl ChangeSet {
head_a = a; head_a = a;
head_b = changes_b.next(); head_b = changes_b.next();
} }
(None, val) | (val, None) => return unreachable!("({:?})", val), (None, val) | (val, None) => unreachable!("({:?})", val),
(Some(Retain(i)), Some(Retain(j))) => match i.cmp(&j) { (Some(Retain(i)), Some(Retain(j))) => match i.cmp(&j) {
Ordering::Less => { Ordering::Less => {
changes.retain(i); changes.retain(i);
@ -202,7 +202,7 @@ impl ChangeSet {
} }
} }
} }
(Some(Insert(mut s)), Some(Retain(j))) => { (Some(Insert(s)), Some(Retain(j))) => {
let len = s.chars().count(); let len = s.chars().count();
match len.cmp(&j) { match len.cmp(&j) {
Ordering::Less => { Ordering::Less => {
@ -274,7 +274,6 @@ impl ChangeSet {
let mut changes = Self::with_capacity(self.changes.len()); let mut changes = Self::with_capacity(self.changes.len());
let mut pos = 0; let mut pos = 0;
let mut len = 0;
for change in &self.changes { for change in &self.changes {
use Operation::*; use Operation::*;
@ -581,6 +580,7 @@ impl<'a> Iterator for ChangeIterator<'a> {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use crate::State;
#[test] #[test]
fn composition() { fn composition() {
@ -699,7 +699,7 @@ mod test {
#[test] #[test]
fn changes_iter() { fn changes_iter() {
let mut state = State::new("hello world!\ntest 123".into()); let state = State::new("hello world!\ntest 123".into());
let changes = vec![(6, 11, Some("void".into())), (12, 17, None)]; let changes = vec![(6, 11, Some("void".into())), (12, 17, None)];
let transaction = Transaction::change(&state.doc, changes.clone().into_iter()); let transaction = Transaction::change(&state.doc, changes.clone().into_iter());
assert_eq!(transaction.changes_iter().collect::<Vec<_>>(), changes); assert_eq!(transaction.changes_iter().collect::<Vec<_>>(), changes);
@ -731,7 +731,7 @@ mod test {
// retain 1, e // retain 1, e
// retain 2, l // retain 2, l
let mut changes = t1 let changes = t1
.changes .changes
.compose(t2.changes) .compose(t2.changes)
.compose(t3.changes) .compose(t3.changes)
@ -746,7 +746,7 @@ mod test {
#[test] #[test]
fn combine_with_empty() { fn combine_with_empty() {
let empty = Rope::from(""); let empty = Rope::from("");
let mut a = ChangeSet::new(&empty); let a = ChangeSet::new(&empty);
let mut b = ChangeSet::new(&empty); let mut b = ChangeSet::new(&empty);
b.insert("a".into()); b.insert("a".into());
@ -762,7 +762,7 @@ mod test {
const TEST_CASE: &'static str = "Hello, これはヘリックスエディターです!"; const TEST_CASE: &'static str = "Hello, これはヘリックスエディターです!";
let empty = Rope::from(""); let empty = Rope::from("");
let mut a = ChangeSet::new(&empty); let a = ChangeSet::new(&empty);
let mut b = ChangeSet::new(&empty); let mut b = ChangeSet::new(&empty);
b.insert(TEST_CASE.into()); b.insert(TEST_CASE.into());

@ -1,37 +1,23 @@
use helix_core::syntax; use helix_core::syntax;
use helix_lsp::{lsp, LspProgressMap}; use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
use helix_view::{document::Mode, graphics::Rect, theme, Document, Editor, Theme, View}; use helix_view::{theme, Editor};
use crate::{ use crate::{args::Args, compositor::Compositor, config::Config, job::Jobs, ui};
args::Args,
compositor::Compositor,
config::Config,
job::Jobs,
keymap::Keymaps,
ui::{self, Spinner},
};
use log::{error, info}; use log::error;
use std::{ use std::{
collections::HashMap, io::{stdout, Write},
future::Future,
io::{self, stdout, Stdout, Write},
path::PathBuf,
pin::Pin,
sync::Arc, sync::Arc,
time::Duration,
}; };
use anyhow::{Context, Error}; use anyhow::Error;
use crossterm::{ use crossterm::{
event::{Event, EventStream}, event::{Event, EventStream},
execute, terminal, execute, terminal,
}; };
use futures_util::{future, stream::FuturesUnordered};
pub struct Application { pub struct Application {
compositor: Compositor, compositor: Compositor,
editor: Editor, editor: Editor,
@ -39,7 +25,14 @@ pub struct Application {
// TODO should be separate to take only part of the config // TODO should be separate to take only part of the config
config: Config, config: Config,
// Currently never read from. Remove the `allow(dead_code)` when
// that changes.
#[allow(dead_code)]
theme_loader: Arc<theme::Loader>, theme_loader: Arc<theme::Loader>,
// Currently never read from. Remove the `allow(dead_code)` when
// that changes.
#[allow(dead_code)]
syn_loader: Arc<syntax::Loader>, syn_loader: Arc<syntax::Loader>,
jobs: Jobs, jobs: Jobs,
@ -47,7 +40,7 @@ pub struct Application {
} }
impl Application { impl Application {
pub fn new(mut args: Args, mut config: Config) -> Result<Self, Error> { pub fn new(args: Args, mut config: Config) -> Result<Self, Error> {
use helix_view::editor::Action; use helix_view::editor::Action;
let mut compositor = Compositor::new()?; let mut compositor = Compositor::new()?;
let size = compositor.size(); let size = compositor.size();
@ -80,7 +73,7 @@ impl Application {
let mut editor = Editor::new(size, theme_loader.clone(), syn_loader.clone()); let mut editor = Editor::new(size, theme_loader.clone(), syn_loader.clone());
let mut editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys))); let editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys)));
compositor.push(editor_view); compositor.push(editor_view);
if !args.files.is_empty() { if !args.files.is_empty() {
@ -105,7 +98,7 @@ impl Application {
editor.set_theme(theme); editor.set_theme(theme);
let mut app = Self { let app = Self {
compositor, compositor,
editor, editor,
@ -239,10 +232,9 @@ impl Application {
.into_iter() .into_iter()
.filter_map(|diagnostic| { .filter_map(|diagnostic| {
use helix_core::{ use helix_core::{
diagnostic::{Range, Severity, Severity::*}, diagnostic::{Range, Severity::*},
Diagnostic, Diagnostic,
}; };
use helix_lsp::{lsp, util::lsp_pos_to_pos};
use lsp::DiagnosticSeverity; use lsp::DiagnosticSeverity;
let language_server = doc.language_server().unwrap(); let language_server = doc.language_server().unwrap();
@ -372,14 +364,10 @@ impl Application {
self.editor.set_status(status); self.editor.set_status(status);
} }
} }
_ => unreachable!(),
} }
} }
Call::MethodCall(helix_lsp::jsonrpc::MethodCall { Call::MethodCall(helix_lsp::jsonrpc::MethodCall {
method, method, params, id, ..
params,
jsonrpc,
id,
}) => { }) => {
let call = match MethodCall::parse(&method, params) { let call = match MethodCall::parse(&method, params) {
Some(call) => call, Some(call) => call,
@ -459,17 +447,20 @@ impl Application {
// Exit the alternate screen and disable raw mode before panicking // Exit the alternate screen and disable raw mode before panicking
let hook = std::panic::take_hook(); let hook = std::panic::take_hook();
std::panic::set_hook(Box::new(move |info| { std::panic::set_hook(Box::new(move |info| {
execute!(std::io::stdout(), terminal::LeaveAlternateScreen); // We can't handle errors properly inside this closure. And it's
terminal::disable_raw_mode(); // probably not a good idea to `unwrap()` inside a panic handler.
// So we just ignore the `Result`s.
let _ = execute!(std::io::stdout(), terminal::LeaveAlternateScreen);
let _ = terminal::disable_raw_mode();
hook(info); hook(info);
})); }));
self.event_loop().await; self.event_loop().await;
self.editor.close_language_servers(None).await; self.editor.close_language_servers(None).await?;
// reset cursor shape // reset cursor shape
write!(stdout, "\x1B[2 q"); write!(stdout, "\x1B[2 q")?;
execute!(stdout, terminal::LeaveAlternateScreen)?; execute!(stdout, terminal::LeaveAlternateScreen)?;

@ -1,20 +1,21 @@
use helix_core::{ use helix_core::{
comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent, comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent,
line_ending::{ line_ending::{
get_line_ending, get_line_ending_of_str, line_end_char_index, rope_end_without_line_ending, get_line_ending_of_str, line_end_char_index, rope_end_without_line_ending,
str_is_line_ending, str_is_line_ending,
}, },
match_brackets, match_brackets,
movement::{self, Direction}, movement::{self, Direction},
object, pos_at_coords, object, pos_at_coords,
regex::{self, Regex}, regex::{self, Regex},
register::{self, Register, Registers}, register::Register,
search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeGraphemes, search, selection, LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice, Selection,
RopeSlice, Selection, SmallVec, Tendril, Transaction, DEFAULT_LINE_ENDING, SmallVec, Tendril, Transaction,
}; };
use helix_view::{ use helix_view::{
document::{IndentStyle, Mode}, document::{IndentStyle, Mode},
editor::Action,
input::KeyEvent, input::KeyEvent,
keyboard::KeyCode, keyboard::KeyCode,
view::{View, PADDING}, view::{View, PADDING},
@ -25,19 +26,19 @@ use anyhow::anyhow;
use helix_lsp::{ use helix_lsp::{
lsp, lsp,
util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range}, util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range},
LspProgressMap, OffsetEncoding, OffsetEncoding,
}; };
use insert::*; use insert::*;
use movement::Movement; use movement::Movement;
use crate::{ use crate::{
compositor::{self, Callback, Component, Compositor}, compositor::{self, Component, Compositor},
ui::{self, Completion, Picker, Popup, Prompt, PromptEvent}, ui::{self, Picker, Popup, Prompt, PromptEvent},
}; };
use crate::job::{self, Job, JobFuture, Jobs}; use crate::job::{self, Job, Jobs};
use futures_util::{FutureExt, TryFutureExt}; use futures_util::{FutureExt, TryFutureExt};
use std::{fmt, future::Future, path::Display, str::FromStr}; use std::{fmt, future::Future};
use std::{ use std::{
borrow::Cow, borrow::Cow,
@ -59,7 +60,7 @@ pub struct Context<'a> {
impl<'a> Context<'a> { impl<'a> Context<'a> {
/// Push a new component onto the compositor. /// Push a new component onto the compositor.
pub fn push_layer(&mut self, mut component: Box<dyn Component>) { pub fn push_layer(&mut self, component: Box<dyn Component>) {
self.callback = Some(Box::new(|compositor: &mut Compositor| { self.callback = Some(Box::new(|compositor: &mut Compositor| {
compositor.push(component) compositor.push(component)
})); }));
@ -515,7 +516,7 @@ fn extend_next_word_start(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
doc.set_selection( doc.set_selection(
view.id, view.id,
doc.selection(view.id).clone().transform(|mut range| { doc.selection(view.id).clone().transform(|range| {
let word = movement::move_next_word_start(doc.text().slice(..), range, count); let word = movement::move_next_word_start(doc.text().slice(..), range, count);
let pos = word.head; let pos = word.head;
Range::new(range.anchor, pos) Range::new(range.anchor, pos)
@ -528,7 +529,7 @@ fn extend_prev_word_start(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
doc.set_selection( doc.set_selection(
view.id, view.id,
doc.selection(view.id).clone().transform(|mut range| { doc.selection(view.id).clone().transform(|range| {
let word = movement::move_prev_word_start(doc.text().slice(..), range, count); let word = movement::move_prev_word_start(doc.text().slice(..), range, count);
let pos = word.head; let pos = word.head;
Range::new(range.anchor, pos) Range::new(range.anchor, pos)
@ -541,7 +542,7 @@ fn extend_next_word_end(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
doc.set_selection( doc.set_selection(
view.id, view.id,
doc.selection(view.id).clone().transform(|mut range| { doc.selection(view.id).clone().transform(|range| {
let word = movement::move_next_word_end(doc.text().slice(..), range, count); let word = movement::move_next_word_end(doc.text().slice(..), range, count);
let pos = word.head; let pos = word.head;
Range::new(range.anchor, pos) Range::new(range.anchor, pos)
@ -592,7 +593,7 @@ where
doc.set_selection( doc.set_selection(
view.id, view.id,
doc.selection(view.id).clone().transform(|mut range| { doc.selection(view.id).clone().transform(|range| {
search_fn(doc.text().slice(..), ch, range.head, count, inclusive).map_or( search_fn(doc.text().slice(..), ch, range.head, count, inclusive).map_or(
range, range,
|pos| { |pos| {
@ -986,7 +987,7 @@ fn search_impl(doc: &mut Document, view: &mut View, contents: &str, regex: &Rege
// TODO: use one function for search vs extend // TODO: use one function for search vs extend
fn search(cx: &mut Context) { fn search(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
// TODO: could probably share with select_on_matches? // TODO: could probably share with select_on_matches?
@ -994,7 +995,6 @@ fn search(cx: &mut Context) {
// feed chunks into the regex yet // feed chunks into the regex yet
let contents = doc.text().slice(..).to_string(); let contents = doc.text().slice(..).to_string();
let view_id = view.id;
let prompt = ui::regex_prompt( let prompt = ui::regex_prompt(
cx, cx,
"search:".to_string(), "search:".to_string(),
@ -1046,7 +1046,7 @@ fn extend_line(cx: &mut Context) {
let line_start = text.char_to_line(pos.anchor); let line_start = text.char_to_line(pos.anchor);
let start = text.line_to_char(line_start); let start = text.line_to_char(line_start);
let line_end = text.char_to_line(pos.head); let line_end = text.char_to_line(pos.head);
let mut end = line_end_char_index(&text.slice(..), line_end); let mut end = line_end_char_index(&text.slice(..), line_end + count.saturating_sub(1));
if pos.anchor == start && pos.head == end && line_end < (text.len_lines() - 2) { if pos.anchor == start && pos.head == end && line_end < (text.len_lines() - 2) {
end = line_end_char_index(&text.slice(..), line_end + 1); end = line_end_char_index(&text.slice(..), line_end + 1);
@ -1065,7 +1065,6 @@ fn delete_selection_impl(reg: &mut Register, doc: &mut Document, view_id: ViewId
// then delete // then delete
let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| { let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
let line = text.char_to_line(range.head);
(range.from(), range.to(), None) (range.from(), range.to(), None)
}); });
doc.apply(&transaction, view_id); doc.apply(&transaction, view_id);
@ -1175,7 +1174,7 @@ mod cmd {
pub completer: Option<Completer>, pub completer: Option<Completer>,
} }
fn quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn quit(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
// last view and we have unsaved changes // last view and we have unsaved changes
if cx.editor.tree.views().count() == 1 && buffers_remaining_impl(cx.editor) { if cx.editor.tree.views().count() == 1 && buffers_remaining_impl(cx.editor) {
return; return;
@ -1184,16 +1183,16 @@ mod cmd {
.close(view!(cx.editor).id, /* close_buffer */ false); .close(view!(cx.editor).id, /* close_buffer */ false);
} }
fn force_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn force_quit(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
cx.editor cx.editor
.close(view!(cx.editor).id, /* close_buffer */ false); .close(view!(cx.editor).id, /* close_buffer */ false);
} }
fn open(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn open(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
match args.get(0) { match args.get(0) {
Some(path) => { Some(path) => {
// TODO: handle error // TODO: handle error
cx.editor.open(path.into(), Action::Replace); let _ = cx.editor.open(path.into(), Action::Replace);
} }
None => { None => {
cx.editor.set_error("wrong argument count".to_string()); cx.editor.set_error("wrong argument count".to_string());
@ -1205,9 +1204,8 @@ mod cmd {
cx: &mut compositor::Context, cx: &mut compositor::Context,
path: Option<P>, path: Option<P>,
) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> { ) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> {
use anyhow::anyhow;
let jobs = &mut cx.jobs; let jobs = &mut cx.jobs;
let (view, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
if let Some(path) = path { if let Some(path) = path {
if let Err(err) = doc.set_path(path.as_ref()) { if let Err(err) = doc.set_path(path.as_ref()) {
@ -1231,7 +1229,7 @@ mod cmd {
Ok(tokio::spawn(doc.format_and_save(fmt))) Ok(tokio::spawn(doc.format_and_save(fmt)))
} }
fn write(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn write(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
match write_impl(cx, args.first()) { match write_impl(cx, args.first()) {
Err(e) => cx.editor.set_error(e.to_string()), Err(e) => cx.editor.set_error(e.to_string()),
Ok(handle) => { Ok(handle) => {
@ -1241,11 +1239,11 @@ mod cmd {
}; };
} }
fn new_file(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn new_file(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
cx.editor.new_file(Action::Replace); cx.editor.new_file(Action::Replace);
} }
fn format(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn format(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
let (_, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
if let Some(format) = doc.format() { if let Some(format) = doc.format() {
@ -1255,7 +1253,7 @@ mod cmd {
} }
} }
fn set_indent_style(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn set_indent_style(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
use IndentStyle::*; use IndentStyle::*;
// If no argument, report current indent style. // If no argument, report current indent style.
@ -1293,7 +1291,7 @@ mod cmd {
} }
/// Sets or reports the current document's line ending setting. /// Sets or reports the current document's line ending setting.
fn set_line_ending(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn set_line_ending(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
use LineEnding::*; use LineEnding::*;
// If no argument, report current line ending setting. // If no argument, report current line ending setting.
@ -1332,7 +1330,7 @@ mod cmd {
} }
} }
fn earlier(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn earlier(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
let uk = match args.join(" ").parse::<helix_core::history::UndoKind>() { let uk = match args.join(" ").parse::<helix_core::history::UndoKind>() {
Ok(uk) => uk, Ok(uk) => uk,
Err(msg) => { Err(msg) => {
@ -1344,7 +1342,7 @@ mod cmd {
doc.earlier(view.id, uk) doc.earlier(view.id, uk)
} }
fn later(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn later(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
let uk = match args.join(" ").parse::<helix_core::history::UndoKind>() { let uk = match args.join(" ").parse::<helix_core::history::UndoKind>() {
Ok(uk) => uk, Ok(uk) => uk,
Err(msg) => { Err(msg) => {
@ -1372,7 +1370,6 @@ mod cmd {
} }
fn force_write_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn force_write_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
let (view, doc) = current!(cx.editor);
match write_impl(cx, args.first()) { match write_impl(cx, args.first()) {
Ok(handle) => { Ok(handle) => {
if let Err(e) = helix_lsp::block_on(handle) { if let Err(e) = helix_lsp::block_on(handle) {
@ -1414,20 +1411,22 @@ mod cmd {
fn write_all_impl( fn write_all_impl(
editor: &mut Editor, editor: &mut Editor,
args: &[&str], _args: &[&str],
event: PromptEvent, _event: PromptEvent,
quit: bool, quit: bool,
force: bool, force: bool,
) { ) {
let mut errors = String::new(); let mut errors = String::new();
// save all documents // save all documents
for (id, mut doc) in &mut editor.documents { for (_, doc) in &mut editor.documents {
if doc.path().is_none() { if doc.path().is_none() {
errors.push_str("cannot write a buffer without a filename\n"); errors.push_str("cannot write a buffer without a filename\n");
continue; continue;
} }
helix_lsp::block_on(tokio::spawn(doc.save()));
// TODO: handle error.
let _ = helix_lsp::block_on(tokio::spawn(doc.save()));
} }
editor.set_error(errors); editor.set_error(errors);
@ -1456,7 +1455,7 @@ mod cmd {
write_all_impl(&mut cx.editor, args, event, true, true) write_all_impl(&mut cx.editor, args, event, true, true)
} }
fn quit_all_impl(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) { fn quit_all_impl(editor: &mut Editor, _args: &[&str], _event: PromptEvent, force: bool) {
if !force && buffers_remaining_impl(editor) { if !force && buffers_remaining_impl(editor) {
return; return;
} }
@ -1476,7 +1475,7 @@ mod cmd {
quit_all_impl(&mut cx.editor, args, event, true) quit_all_impl(&mut cx.editor, args, event, true)
} }
fn theme(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { fn theme(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
let theme = if let Some(theme) = args.first() { let theme = if let Some(theme) = args.first() {
theme theme
} else { } else {
@ -1487,11 +1486,15 @@ mod cmd {
cx.editor.set_theme_from_name(theme); cx.editor.set_theme_from_name(theme);
} }
fn yank_main_selection_to_clipboard(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { fn yank_main_selection_to_clipboard(
cx: &mut compositor::Context,
_args: &[&str],
_event: PromptEvent,
) {
yank_main_selection_to_clipboard_impl(&mut cx.editor); yank_main_selection_to_clipboard_impl(&mut cx.editor);
} }
fn yank_joined_to_clipboard(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) { fn yank_joined_to_clipboard(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
let (_, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
let separator = args let separator = args
.first() .first()
@ -1500,15 +1503,19 @@ mod cmd {
yank_joined_to_clipboard_impl(&mut cx.editor, separator); yank_joined_to_clipboard_impl(&mut cx.editor, separator);
} }
fn paste_clipboard_after(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { fn paste_clipboard_after(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
paste_clipboard_impl(&mut cx.editor, Paste::After); paste_clipboard_impl(&mut cx.editor, Paste::After);
} }
fn paste_clipboard_before(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { fn paste_clipboard_before(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
paste_clipboard_impl(&mut cx.editor, Paste::After); paste_clipboard_impl(&mut cx.editor, Paste::After);
} }
fn replace_selections_with_clipboard(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { fn replace_selections_with_clipboard(
cx: &mut compositor::Context,
_args: &[&str],
_event: PromptEvent,
) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
match cx.editor.clipboard_provider.get_contents() { match cx.editor.clipboard_provider.get_contents() {
@ -1529,12 +1536,12 @@ mod cmd {
} }
} }
fn show_clipboard_provider(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { fn show_clipboard_provider(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
cx.editor cx.editor
.set_status(cx.editor.clipboard_provider.name().into()); .set_status(cx.editor.clipboard_provider.name().into());
} }
fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) { fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
let dir = match args.first() { let dir = match args.first() {
Some(dir) => dir, Some(dir) => dir,
None => { None => {
@ -1562,7 +1569,7 @@ mod cmd {
} }
} }
fn show_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) { fn show_current_directory(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
match std::env::current_dir() { match std::env::current_dir() {
Ok(cwd) => cx Ok(cwd) => cx
.editor .editor
@ -1782,7 +1789,6 @@ fn command_mode(cx: &mut Context) {
// simple heuristic: if there's no just one part, complete command name. // simple heuristic: if there's no just one part, complete command name.
// if there's a space, per command completion kicks in. // if there's a space, per command completion kicks in.
if parts.len() <= 1 { if parts.len() <= 1 {
use std::{borrow::Cow, ops::Range};
let end = 0..; let end = 0..;
cmd::TYPABLE_COMMAND_LIST cmd::TYPABLE_COMMAND_LIST
.iter() .iter()
@ -1812,8 +1818,6 @@ fn command_mode(cx: &mut Context) {
} }
}, // completion }, // completion
move |cx: &mut compositor::Context, input: &str, event: PromptEvent| { move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
use helix_view::editor::Action;
if event != PromptEvent::Validate { if event != PromptEvent::Validate {
return; return;
} }
@ -1851,7 +1855,6 @@ fn file_picker(cx: &mut Context) {
} }
fn buffer_picker(cx: &mut Context) { fn buffer_picker(cx: &mut Context) {
use std::path::{Path, PathBuf};
let current = view!(cx.editor).doc; let current = view!(cx.editor).doc;
let picker = Picker::new( let picker = Picker::new(
@ -1874,7 +1877,6 @@ fn buffer_picker(cx: &mut Context) {
} }
}, },
|editor: &mut Editor, (id, _path): &(DocumentId, Option<PathBuf>), _action| { |editor: &mut Editor, (id, _path): &(DocumentId, Option<PathBuf>), _action| {
use helix_view::editor::Action;
editor.switch(*id, Action::Replace); editor.switch(*id, Action::Replace);
}, },
); );
@ -1900,7 +1902,7 @@ fn symbol_picker(cx: &mut Context) {
nested_to_flat(list, file, child); nested_to_flat(list, file, child);
} }
} }
let (view, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
let language_server = match doc.language_server() { let language_server = match doc.language_server() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -1993,7 +1995,7 @@ async fn make_format_callback(
format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static, format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static,
) -> anyhow::Result<job::Callback> { ) -> anyhow::Result<job::Callback> {
let format = format.await; let format = format.await;
let call: job::Callback = Box::new(move |editor: &mut Editor, compositor: &mut Compositor| { let call: job::Callback = Box::new(move |editor: &mut Editor, _compositor: &mut Compositor| {
let view_id = view!(editor).id; let view_id = view!(editor).id;
if let Some(doc) = editor.document_mut(doc_id) { if let Some(doc) = editor.document_mut(doc_id) {
if doc.version() == doc_version { if doc.version() == doc_version {
@ -2168,9 +2170,6 @@ fn goto_mode(cx: &mut Context) {
(_, 't') | (_, 'm') | (_, 'b') => { (_, 't') | (_, 'm') | (_, 'b') => {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let pos = doc.selection(view.id).cursor();
let line = doc.text().char_to_line(pos);
let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref
let last_line = view.last_line(doc); let last_line = view.last_line(doc);
@ -2207,8 +2206,6 @@ fn goto_impl(
locations: Vec<lsp::Location>, locations: Vec<lsp::Location>,
offset_encoding: OffsetEncoding, offset_encoding: OffsetEncoding,
) { ) {
use helix_view::editor::Action;
push_jump(editor); push_jump(editor);
fn jump_to( fn jump_to(
@ -2221,7 +2218,7 @@ fn goto_impl(
.uri .uri
.to_file_path() .to_file_path()
.expect("unable to convert URI to filepath"); .expect("unable to convert URI to filepath");
let id = editor.open(path, action).expect("editor.open failed"); let _id = editor.open(path, action).expect("editor.open failed");
let (view, doc) = current!(editor); let (view, doc) = current!(editor);
let definition_pos = location.range.start; let definition_pos = location.range.start;
// TODO: convert inside server // TODO: convert inside server
@ -2243,7 +2240,7 @@ fn goto_impl(
editor.set_error("No definition found.".to_string()); editor.set_error("No definition found.".to_string());
} }
_locations => { _locations => {
let mut picker = ui::Picker::new( let picker = ui::Picker::new(
locations, locations,
|location| { |location| {
let file = location.uri.as_str(); let file = location.uri.as_str();
@ -2410,9 +2407,8 @@ fn goto_pos(editor: &mut Editor, pos: usize) {
fn goto_first_diag(cx: &mut Context) { fn goto_first_diag(cx: &mut Context) {
let editor = &mut cx.editor; let editor = &mut cx.editor;
let (view, doc) = current!(editor); let (_, doc) = current!(editor);
let cursor_pos = doc.selection(view.id).cursor();
let diag = if let Some(diag) = doc.diagnostics().first() { let diag = if let Some(diag) = doc.diagnostics().first() {
diag.range.start diag.range.start
} else { } else {
@ -2424,9 +2420,8 @@ fn goto_first_diag(cx: &mut Context) {
fn goto_last_diag(cx: &mut Context) { fn goto_last_diag(cx: &mut Context) {
let editor = &mut cx.editor; let editor = &mut cx.editor;
let (view, doc) = current!(editor); let (_, doc) = current!(editor);
let cursor_pos = doc.selection(view.id).cursor();
let diag = if let Some(diag) = doc.diagnostics().last() { let diag = if let Some(diag) = doc.diagnostics().last() {
diag.range.start diag.range.start
} else { } else {
@ -2498,8 +2493,8 @@ fn signature_help(cx: &mut Context) {
cx.callback( cx.callback(
future, future,
move |editor: &mut Editor, move |_editor: &mut Editor,
compositor: &mut Compositor, _compositor: &mut Compositor,
response: Option<lsp::SignatureHelp>| { response: Option<lsp::SignatureHelp>| {
if let Some(signature_help) = response { if let Some(signature_help) = response {
log::info!("{:?}", signature_help); log::info!("{:?}", signature_help);
@ -3080,8 +3075,10 @@ fn format_selections(cx: &mut Context) {
.map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding())) .map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding()))
.collect(); .collect();
for range in ranges { // TODO: all of the TODO's and commented code inside the loop,
let language_server = match doc.language_server() { // to make this actually work.
for _range in ranges {
let _language_server = match doc.language_server() {
Some(language_server) => language_server, Some(language_server) => language_server,
None => return, None => return,
}; };
@ -3129,7 +3126,7 @@ fn join_selections(cx: &mut Context) {
changes.reserve(lines.len()); changes.reserve(lines.len());
for line in lines { for line in lines {
let mut start = line_end_char_index(&slice, line); let start = line_end_char_index(&slice, line);
let mut end = text.line_to_char(line + 1); let mut end = text.line_to_char(line + 1);
end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end); end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
@ -3252,7 +3249,6 @@ fn completion(cx: &mut Context) {
if items.is_empty() { if items.is_empty() {
return; return;
} }
use crate::compositor::AnyComponent;
let size = compositor.size(); let size = compositor.size();
let ui = compositor let ui = compositor
.find(std::any::type_name::<ui::EditorView>()) .find(std::any::type_name::<ui::EditorView>())
@ -3306,7 +3302,7 @@ fn hover(cx: &mut Context) {
// skip if contents empty // skip if contents empty
let contents = ui::Markdown::new(contents, editor.syn_loader.clone()); let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
let mut popup = Popup::new(contents); let popup = Popup::new(contents);
compositor.push(Box::new(popup)); compositor.push(Box::new(popup));
} }
}, },
@ -3350,7 +3346,7 @@ fn match_brackets(cx: &mut Context) {
fn jump_forward(cx: &mut Context) { fn jump_forward(cx: &mut Context) {
let count = cx.count(); let count = cx.count();
let (view, doc) = current!(cx.editor); let (view, _doc) = current!(cx.editor);
if let Some((id, selection)) = view.jumps.forward(count) { if let Some((id, selection)) = view.jumps.forward(count) {
view.doc = *id; view.doc = *id;
@ -3403,11 +3399,7 @@ fn rotate_view(cx: &mut Context) {
} }
// split helper, clear it later // split helper, clear it later
use helix_view::editor::Action;
use self::cmd::TypableCommand;
fn split(cx: &mut Context, action: Action) { fn split(cx: &mut Context, action: Action) {
use helix_view::editor::Action;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let id = doc.id(); let id = doc.id();
let selection = doc.selection(view.id).clone(); let selection = doc.selection(view.id).clone();
@ -3563,10 +3555,7 @@ fn match_mode(cx: &mut Context) {
'm' => match_brackets(cx), 'm' => match_brackets(cx),
's' => surround_add(cx), 's' => surround_add(cx),
'r' => surround_replace(cx), 'r' => surround_replace(cx),
'd' => { 'd' => surround_delete(cx),
surround_delete(cx);
let (view, doc) = current!(cx.editor);
}
_ => (), _ => (),
} }
} }
@ -3588,7 +3577,7 @@ fn surround_add(cx: &mut Context) {
let (open, close) = surround::get_pair(ch); let (open, close) = surround::get_pair(ch);
let mut changes = Vec::new(); let mut changes = Vec::new();
for (i, range) in selection.iter().enumerate() { for range in selection.iter() {
changes.push((range.from(), range.from(), Some(Tendril::from_char(open)))); changes.push((range.from(), range.from(), Some(Tendril::from_char(open))));
changes.push((range.to(), range.to(), Some(Tendril::from_char(close)))); changes.push((range.to(), range.to(), Some(Tendril::from_char(close))));
} }

@ -2,7 +2,6 @@
// Q: how does this work with popups? // Q: how does this work with popups?
// cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>) // cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>)
use helix_core::Position; use helix_core::Position;
use helix_lsp::LspProgressMap;
use helix_view::graphics::{CursorKind, Rect}; use helix_view::graphics::{CursorKind, Rect};
use crossterm::event::Event; use crossterm::event::Event;
@ -36,7 +35,7 @@ pub struct Context<'a> {
pub trait Component: Any + AnyComponent { pub trait Component: Any + AnyComponent {
/// Process input events, return true if handled. /// Process input events, return true if handled.
fn handle_event(&mut self, event: Event, ctx: &mut Context) -> EventResult { fn handle_event(&mut self, _event: Event, _ctx: &mut Context) -> EventResult {
EventResult::Ignored EventResult::Ignored
} }
// , args: () // , args: ()
@ -50,13 +49,13 @@ pub trait Component: Any + AnyComponent {
fn render(&self, area: Rect, frame: &mut Surface, ctx: &mut Context); fn render(&self, area: Rect, frame: &mut Surface, ctx: &mut Context);
/// Get cursor position and cursor kind. /// Get cursor position and cursor kind.
fn cursor(&self, area: Rect, ctx: &Editor) -> (Option<Position>, CursorKind) { fn cursor(&self, _area: Rect, _ctx: &Editor) -> (Option<Position>, CursorKind) {
(None, CursorKind::Hidden) (None, CursorKind::Hidden)
} }
/// May be used by the parent component to compute the child area. /// May be used by the parent component to compute the child area.
/// viewport is the maximum allowed area, and the child should stay within those bounds. /// viewport is the maximum allowed area, and the child should stay within those bounds.
fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> { fn required_size(&mut self, _viewport: (u16, u16)) -> Option<(u16, u16)> {
// TODO: for scrolling, the scroll wrapper should place a size + offset on the Context // TODO: for scrolling, the scroll wrapper should place a size + offset on the Context
// that way render can use it // that way render can use it
None None
@ -80,7 +79,7 @@ pub struct Compositor {
impl Compositor { impl Compositor {
pub fn new() -> Result<Self, Error> { pub fn new() -> Result<Self, Error> {
let backend = CrosstermBackend::new(stdout()); let backend = CrosstermBackend::new(stdout());
let mut terminal = Terminal::new(backend)?; let terminal = Terminal::new(backend)?;
Ok(Self { Ok(Self {
layers: Vec::new(), layers: Vec::new(),
terminal, terminal,
@ -125,8 +124,7 @@ impl Compositor {
} }
pub fn render(&mut self, cx: &mut Context) { pub fn render(&mut self, cx: &mut Context) {
let area = self self.terminal
.terminal
.autoresize() .autoresize()
.expect("Unable to determine terminal size"); .expect("Unable to determine terminal size");
@ -143,7 +141,7 @@ impl Compositor {
let (pos, kind) = self.cursor(area, cx.editor); let (pos, kind) = self.cursor(area, cx.editor);
let pos = pos.map(|pos| (pos.col as u16, pos.row as u16)); let pos = pos.map(|pos| (pos.col as u16, pos.row as u16));
self.terminal.draw(pos, kind); self.terminal.draw(pos, kind).unwrap();
} }
pub fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) { pub fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {

@ -1,10 +1,10 @@
use anyhow::{Error, Result};
use serde::Deserialize; use serde::Deserialize;
use std::collections::HashMap;
use crate::commands::Command;
use crate::keymap::Keymaps; use crate::keymap::Keymaps;
#[cfg(test)]
use crate::commands::Command;
#[derive(Debug, Default, Clone, PartialEq, Deserialize)] #[derive(Debug, Default, Clone, PartialEq, Deserialize)]
pub struct Config { pub struct Config {
pub theme: Option<String>, pub theme: Option<String>,

@ -3,7 +3,7 @@ use helix_view::Editor;
use crate::compositor::Compositor; use crate::compositor::Compositor;
use futures_util::future::{self, BoxFuture, Future, FutureExt}; use futures_util::future::{self, BoxFuture, Future, FutureExt};
use futures_util::stream::{self, FuturesUnordered, Select, StreamExt}; use futures_util::stream::{FuturesUnordered, StreamExt};
pub type Callback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>; pub type Callback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>;
pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>; pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;

@ -1,7 +1,5 @@
use crate::commands;
pub use crate::commands::Command; pub use crate::commands::Command;
use crate::config::Config; use crate::config::Config;
use anyhow::{anyhow, Error, Result};
use helix_core::hashmap; use helix_core::hashmap;
use helix_view::{ use helix_view::{
document::Mode, document::Mode,
@ -11,9 +9,7 @@ use helix_view::{
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{
collections::HashMap, collections::HashMap,
fmt::Display,
ops::{Deref, DerefMut}, ops::{Deref, DerefMut},
str::FromStr,
}; };
// Kakoune-inspired: // Kakoune-inspired:

@ -1,5 +1,3 @@
#![allow(unused)]
#[macro_use] #[macro_use]
extern crate helix_view; extern crate helix_view;

@ -1,19 +1,16 @@
use crate::compositor::{Component, Compositor, Context, EventResult}; use crate::compositor::{Component, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; use crossterm::event::{Event, KeyCode, KeyEvent};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use std::borrow::Cow; use std::borrow::Cow;
use helix_core::{Position, Transaction}; use helix_core::Transaction;
use helix_view::{ use helix_view::{graphics::Rect, Editor};
graphics::{Color, Rect, Style},
Editor,
};
use crate::commands; use crate::commands;
use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent}; use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent};
use helix_lsp::lsp; use helix_lsp::{lsp, util};
use lsp::CompletionItem; use lsp::CompletionItem;
impl menu::Item for CompletionItem { impl menu::Item for CompletionItem {
@ -79,7 +76,7 @@ impl Completion {
trigger_offset: usize, trigger_offset: usize,
) -> Self { ) -> Self {
// let items: Vec<CompletionItem> = Vec::new(); // let items: Vec<CompletionItem> = Vec::new();
let mut menu = Menu::new(items, move |editor: &mut Editor, item, event| { let menu = Menu::new(items, move |editor: &mut Editor, item, event| {
match event { match event {
PromptEvent::Abort => {} PromptEvent::Abort => {}
PromptEvent::Validate => { PromptEvent::Validate => {
@ -88,8 +85,6 @@ impl Completion {
// always present here // always present here
let item = item.unwrap(); let item = item.unwrap();
use helix_lsp::{lsp, util};
// if more text was entered, remove it // if more text was entered, remove it
let cursor = doc.selection(view.id).cursor(); let cursor = doc.selection(view.id).cursor();
if trigger_offset < cursor { if trigger_offset < cursor {
@ -100,7 +95,6 @@ impl Completion {
doc.apply(&remove, view.id); doc.apply(&remove, view.id);
} }
use helix_lsp::OffsetEncoding;
let transaction = if let Some(edit) = &item.text_edit { let transaction = if let Some(edit) = &item.text_edit {
let edit = match edit { let edit = match edit {
lsp::CompletionTextEdit::Edit(edit) => edit.clone(), lsp::CompletionTextEdit::Edit(edit) => edit.clone(),

@ -1,32 +1,28 @@
use crate::{ use crate::{
commands, commands,
compositor::{Component, Compositor, Context, EventResult}, compositor::{Component, Context, EventResult},
key, key,
keymap::{self, Keymaps}, keymap::Keymaps,
ui::{Completion, ProgressSpinners}, ui::{Completion, ProgressSpinners},
}; };
use helix_core::{ use helix_core::{
coords_at_pos, coords_at_pos,
graphemes::ensure_grapheme_boundary_next, graphemes::ensure_grapheme_boundary_next,
syntax::{self, Highlight, HighlightEvent}, syntax::{self, HighlightEvent},
LineEnding, Position, Range, LineEnding, Position, Range,
}; };
use helix_lsp::LspProgressMap;
use helix_view::{ use helix_view::{
document::Mode, document::Mode,
graphics::{Color, CursorKind, Modifier, Rect, Style}, graphics::{CursorKind, Modifier, Rect, Style},
input::KeyEvent, input::KeyEvent,
keyboard::{KeyCode, KeyModifiers}, keyboard::{KeyCode, KeyModifiers},
Document, Editor, Theme, View, Document, Editor, Theme, View,
}; };
use std::borrow::Cow; use std::borrow::Cow;
use crossterm::{ use crossterm::event::Event;
cursor, use tui::buffer::Buffer as Surface;
event::{read, Event, EventStream},
};
use tui::{backend::CrosstermBackend, buffer::Buffer as Surface};
pub struct EditorView { pub struct EditorView {
keymaps: Keymaps, keymaps: Keymaps,
@ -396,7 +392,7 @@ impl EditorView {
viewport: Rect, viewport: Rect,
surface: &mut Surface, surface: &mut Surface,
theme: &Theme, theme: &Theme,
is_focused: bool, _is_focused: bool,
) { ) {
use helix_core::diagnostic::Severity; use helix_core::diagnostic::Severity;
use tui::{ use tui::{
@ -406,7 +402,6 @@ impl EditorView {
}; };
let cursor = doc.selection(view.id).cursor(); let cursor = doc.selection(view.id).cursor();
let line = doc.text().char_to_line(cursor);
let diagnostics = doc.diagnostics().iter().filter(|diagnostic| { let diagnostics = doc.diagnostics().iter().filter(|diagnostic| {
diagnostic.range.start <= cursor && diagnostic.range.end >= cursor diagnostic.range.start <= cursor && diagnostic.range.end >= cursor
@ -612,7 +607,7 @@ impl Component for EditorView {
// clear status // clear status
cx.editor.status_msg = None; cx.editor.status_msg = None;
let (view, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
let mode = doc.mode(); let mode = doc.mode();
let mut cxt = commands::Context { let mut cxt = commands::Context {
@ -709,7 +704,7 @@ impl Component for EditorView {
} }
} }
fn render(&self, mut area: Rect, surface: &mut Surface, cx: &mut Context) { fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
// clear with background color // clear with background color
surface.set_style(area, cx.editor.theme.get("ui.background")); surface.set_style(area, cx.editor.theme.get("ui.background"));
@ -745,7 +740,7 @@ impl Component for EditorView {
} }
} }
fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) { fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
// match view.doc.mode() { // match view.doc.mode() {
// Mode::Insert => write!(stdout, "\x1B[6 q"), // Mode::Insert => write!(stdout, "\x1B[6 q"),
// mode => write!(stdout, "\x1B[2 q"), // mode => write!(stdout, "\x1B[2 q"),

@ -1,13 +1,20 @@
use crate::compositor::{Component, Compositor, Context, EventResult}; use crate::compositor::{Component, Context};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; use tui::{
use tui::{buffer::Buffer as Surface, text::Text}; buffer::Buffer as Surface,
text::{Span, Spans, Text},
};
use std::sync::Arc;
use std::{borrow::Cow, sync::Arc}; use pulldown_cmark::{CodeBlockKind, CowStr, Event, Options, Parser, Tag};
use helix_core::{syntax, Position}; use helix_core::{
syntax::{self, HighlightEvent, Syntax},
Rope,
};
use helix_view::{ use helix_view::{
graphics::{Color, Rect, Style}, graphics::{Color, Rect, Style},
Editor, Theme, Theme,
}; };
pub struct Markdown { pub struct Markdown {
@ -33,11 +40,8 @@ fn parse<'a>(
theme: Option<&Theme>, theme: Option<&Theme>,
loader: &syntax::Loader, loader: &syntax::Loader,
) -> tui::text::Text<'a> { ) -> tui::text::Text<'a> {
use pulldown_cmark::{CodeBlockKind, CowStr, Event, Options, Parser, Tag}; // // also 2021-03-04T16:33:58.553 helix_lsp::transport [INFO] <- {"contents":{"kind":"markdown","value":"\n```rust\ncore::num\n```\n\n```rust\npub const fn saturating_sub(self, rhs:Self) ->Self\n```\n\n---\n\n```rust\n```"},"range":{"end":{"character":61,"line":101},"start":{"character":47,"line":101}}}
use tui::text::{Span, Spans, Text}; // let text = "\n```rust\ncore::iter::traits::iterator::Iterator\n```\n\n```rust\nfn collect<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
// also 2021-03-04T16:33:58.553 helix_lsp::transport [INFO] <- {"contents":{"kind":"markdown","value":"\n```rust\ncore::num\n```\n\n```rust\npub const fn saturating_sub(self, rhs:Self) ->Self\n```\n\n---\n\n```rust\n```"},"range":{"end":{"character":61,"line":101},"start":{"character":47,"line":101}}}
let text = "\n```rust\ncore::iter::traits::iterator::Iterator\n```\n\n```rust\nfn collect<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
let mut options = Options::empty(); let mut options = Options::empty();
options.insert(Options::ENABLE_STRIKETHROUGH); options.insert(Options::ENABLE_STRIKETHROUGH);
@ -82,16 +86,13 @@ fn parse<'a>(
// TODO: temp workaround // TODO: temp workaround
if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() { if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() {
if let Some(theme) = theme { if let Some(theme) = theme {
use helix_core::syntax::{self, HighlightEvent, Syntax};
use helix_core::Rope;
let rope = Rope::from(text.as_ref()); let rope = Rope::from(text.as_ref());
let syntax = loader let syntax = loader
.language_config_for_scope(&format!("source.{}", language)) .language_config_for_scope(&format!("source.{}", language))
.and_then(|config| config.highlight_config(theme.scopes())) .and_then(|config| config.highlight_config(theme.scopes()))
.map(|config| Syntax::new(&rope, config)); .map(|config| Syntax::new(&rope, config));
if let Some(mut syntax) = syntax { if let Some(syntax) = syntax {
// if we have a syntax available, highlight_iter and generate spans // if we have a syntax available, highlight_iter and generate spans
let mut highlights = Vec::new(); let mut highlights = Vec::new();
@ -141,13 +142,13 @@ fn parse<'a>(
} }
} else { } else {
for line in text.lines() { for line in text.lines() {
let mut span = Span::styled(line.to_string(), code_style); let span = Span::styled(line.to_string(), code_style);
lines.push(Spans::from(span)); lines.push(Spans::from(span));
} }
} }
} else { } else {
for line in text.lines() { for line in text.lines() {
let mut span = Span::styled(line.to_string(), code_style); let span = Span::styled(line.to_string(), code_style);
lines.push(Spans::from(span)); lines.push(Spans::from(span));
} }
} }

@ -4,16 +4,10 @@ use tui::{buffer::Buffer as Surface, widgets::Table};
pub use tui::widgets::{Cell, Row}; pub use tui::widgets::{Cell, Row};
use std::borrow::Cow;
use fuzzy_matcher::skim::SkimMatcherV2 as Matcher; use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
use fuzzy_matcher::FuzzyMatcher; use fuzzy_matcher::FuzzyMatcher;
use helix_core::Position; use helix_view::{graphics::Rect, Editor};
use helix_view::{
graphics::{Color, Rect, Style},
Editor,
};
pub trait Item { pub trait Item {
// TODO: sort_text // TODO: sort_text
@ -64,7 +58,6 @@ impl<T: Item> Menu<T> {
pub fn score(&mut self, pattern: &str) { pub fn score(&mut self, pattern: &str) {
// need to borrow via pattern match otherwise it complains about simultaneous borrow // need to borrow via pattern match otherwise it complains about simultaneous borrow
let Self { let Self {
ref mut options,
ref mut matcher, ref mut matcher,
ref mut matches, ref mut matches,
.. ..
@ -297,7 +290,7 @@ impl<T: Item + 'static> Component for Menu<T> {
// ) // )
// } // }
for (i, option) in (scroll..(scroll + win_height).min(len)).enumerate() { for (i, _) in (scroll..(scroll + win_height).min(len)).enumerate() {
let is_marked = i >= scroll_line && i < scroll_line + scroll_height; let is_marked = i >= scroll_line && i < scroll_line + scroll_height;
if is_marked { if is_marked {

@ -20,12 +20,9 @@ pub use text::Text;
use helix_core::regex::Regex; use helix_core::regex::Regex;
use helix_core::register::Registers; use helix_core::register::Registers;
use helix_view::{ use helix_view::{Document, Editor, View};
graphics::{Color, Modifier, Rect, Style},
Document, Editor, View,
};
use std::path::{Path, PathBuf}; use std::path::PathBuf;
pub fn regex_prompt( pub fn regex_prompt(
cx: &mut crate::commands::Context, cx: &mut crate::commands::Context,
@ -38,7 +35,7 @@ pub fn regex_prompt(
Prompt::new( Prompt::new(
prompt, prompt,
|input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate |_input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate
move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| { move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| {
match event { match event {
PromptEvent::Abort => { PromptEvent::Abort => {
@ -121,7 +118,7 @@ pub fn file_picker(root: PathBuf) -> Picker<PathBuf> {
.into() .into()
}, },
move |editor: &mut Editor, path: &PathBuf, action| { move |editor: &mut Editor, path: &PathBuf, action| {
let document_id = editor editor
.open(path.into(), action) .open(path.into(), action)
.expect("editor.open failed"); .expect("editor.open failed");
}, },
@ -133,8 +130,8 @@ pub mod completers {
use fuzzy_matcher::skim::SkimMatcherV2 as Matcher; use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
use fuzzy_matcher::FuzzyMatcher; use fuzzy_matcher::FuzzyMatcher;
use helix_view::theme; use helix_view::theme;
use std::borrow::Cow;
use std::cmp::Reverse; use std::cmp::Reverse;
use std::{borrow::Cow, sync::Arc};
pub type Completer = fn(&str) -> Vec<Completion>; pub type Completer = fn(&str) -> Vec<Completion>;
@ -154,7 +151,7 @@ pub mod completers {
let mut matches: Vec<_> = names let mut matches: Vec<_> = names
.into_iter() .into_iter()
.filter_map(|(range, name)| { .filter_map(|(_range, name)| {
matcher.fuzzy_match(&name, input).map(|score| (name, score)) matcher.fuzzy_match(&name, input).map(|score| (name, score))
}) })
.collect(); .collect();
@ -208,7 +205,7 @@ pub mod completers {
// Rust's filename handling is really annoying. // Rust's filename handling is really annoying.
use ignore::WalkBuilder; use ignore::WalkBuilder;
use std::path::{Path, PathBuf}; use std::path::Path;
let is_tilde = input.starts_with('~') && input.len() == 1; let is_tilde = input.starts_with('~') && input.len() == 1;
let path = helix_view::document::expand_tilde(Path::new(input)); let path = helix_view::document::expand_tilde(Path::new(input));
@ -229,7 +226,7 @@ pub mod completers {
(path, file_name) (path, file_name)
}; };
let end = (input.len()..); let end = input.len()..;
let mut files: Vec<_> = WalkBuilder::new(dir.clone()) let mut files: Vec<_> = WalkBuilder::new(dir.clone())
.max_depth(Some(1)) .max_depth(Some(1))
@ -242,7 +239,7 @@ pub mod completers {
return None; return None;
} }
let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir()); //let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
let path = entry.path(); let path = entry.path();
let mut path = if is_tilde { let mut path = if is_tilde {
@ -274,14 +271,14 @@ pub mod completers {
// inefficient, but we need to calculate the scores, filter out None, then sort. // inefficient, but we need to calculate the scores, filter out None, then sort.
let mut matches: Vec<_> = files let mut matches: Vec<_> = files
.into_iter() .into_iter()
.filter_map(|(range, file)| { .filter_map(|(_range, file)| {
matcher matcher
.fuzzy_match(&file, &file_name) .fuzzy_match(&file, &file_name)
.map(|score| (file, score)) .map(|score| (file, score))
}) })
.collect(); .collect();
let range = ((input.len().saturating_sub(file_name.len()))..); let range = (input.len().saturating_sub(file_name.len()))..;
matches.sort_unstable_by_key(|(_file, score)| Reverse(*score)); matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
files = matches files = matches

@ -43,8 +43,8 @@ impl<T> Picker<T> {
) -> Self { ) -> Self {
let prompt = Prompt::new( let prompt = Prompt::new(
"".to_string(), "".to_string(),
|pattern: &str| Vec::new(), |_pattern: &str| Vec::new(),
|editor: &mut Context, pattern: &str, event: PromptEvent| { |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {
// //
}, },
); );
@ -69,7 +69,6 @@ impl<T> Picker<T> {
pub fn score(&mut self) { pub fn score(&mut self) {
// need to borrow via pattern match otherwise it complains about simultaneous borrow // need to borrow via pattern match otherwise it complains about simultaneous borrow
let Self { let Self {
ref mut options,
ref mut matcher, ref mut matcher,
ref mut matches, ref mut matches,
ref filters, ref filters,

@ -2,13 +2,8 @@ use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use std::borrow::Cow;
use helix_core::Position; use helix_core::Position;
use helix_view::{ use helix_view::graphics::Rect;
graphics::{Color, Rect, Style},
Editor,
};
// TODO: share logic with Menu, it's essentially Popup(render_fn), but render fn needs to return // TODO: share logic with Menu, it's essentially Popup(render_fn), but render fn needs to return
// a width/height hint. maybe Popup(Box<Component>) // a width/height hint. maybe Popup(Box<Component>)
@ -57,7 +52,7 @@ impl<T: Component> Component for Popup<T> {
fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
let key = match event { let key = match event {
Event::Key(event) => event, Event::Key(event) => event,
Event::Resize(width, height) => { Event::Resize(_, _) => {
// TODO: calculate inner area, call component's handle_event with that area // TODO: calculate inner area, call component's handle_event with that area
return EventResult::Ignored; return EventResult::Ignored;
} }
@ -99,7 +94,7 @@ impl<T: Component> Component for Popup<T> {
// tab/enter/ctrl-k or whatever will confirm the selection/ ctrl-n/ctrl-p for scroll. // tab/enter/ctrl-k or whatever will confirm the selection/ ctrl-n/ctrl-p for scroll.
} }
fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> { fn required_size(&mut self, _viewport: (u16, u16)) -> Option<(u16, u16)> {
let (width, height) = self let (width, height) = self
.contents .contents
.required_size((120, 26)) // max width, max height .required_size((120, 26)) // max width, max height
@ -135,7 +130,6 @@ impl<T: Component> Component for Popup<T> {
rel_y += 1 // position below point rel_y += 1 // position below point
} }
let area = Rect::new(rel_x, rel_y, width, height);
// clip to viewport // clip to viewport
let area = viewport.intersection(Rect::new(rel_x, rel_y, width, height)); let area = viewport.intersection(Rect::new(rel_x, rel_y, width, height));

@ -5,13 +5,11 @@ use std::{borrow::Cow, ops::RangeFrom};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use helix_core::{ use helix_core::{
unicode::segmentation::{GraphemeCursor, GraphemeIncomplete}, unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position,
unicode::width::UnicodeWidthStr,
Position,
}; };
use helix_view::{ use helix_view::{
graphics::{Color, CursorKind, Margin, Modifier, Rect, Style}, graphics::{CursorKind, Margin, Rect},
Editor, Theme, Editor,
}; };
pub type Completion = (RangeFrom<usize>, Cow<'static, str>); pub type Completion = (RangeFrom<usize>, Cow<'static, str>);
@ -398,6 +396,22 @@ impl Component for Prompt {
(self.callback_fn)(cx, &self.line, PromptEvent::Abort); (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
return close_fn; return close_fn;
} }
KeyEvent {
code: KeyCode::Left,
modifiers: KeyModifiers::ALT,
}
| KeyEvent {
code: KeyCode::Char('b'),
modifiers: KeyModifiers::ALT,
} => self.move_cursor(Movement::BackwardWord(1)),
KeyEvent {
code: KeyCode::Right,
modifiers: KeyModifiers::ALT,
}
| KeyEvent {
code: KeyCode::Char('f'),
modifiers: KeyModifiers::ALT,
} => self.move_cursor(Movement::ForwardWord(1)),
KeyEvent { KeyEvent {
code: KeyCode::Char('f'), code: KeyCode::Char('f'),
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,
@ -430,22 +444,6 @@ impl Component for Prompt {
code: KeyCode::Char('a'), code: KeyCode::Char('a'),
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,
} => self.move_start(), } => self.move_start(),
KeyEvent {
code: KeyCode::Left,
modifiers: KeyModifiers::ALT,
}
| KeyEvent {
code: KeyCode::Char('b'),
modifiers: KeyModifiers::ALT,
} => self.move_cursor(Movement::BackwardWord(1)),
KeyEvent {
code: KeyCode::Right,
modifiers: KeyModifiers::ALT,
}
| KeyEvent {
code: KeyCode::Char('f'),
modifiers: KeyModifiers::ALT,
} => self.move_cursor(Movement::ForwardWord(1)),
KeyEvent { KeyEvent {
code: KeyCode::Char('w'), code: KeyCode::Char('w'),
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,
@ -494,7 +492,7 @@ impl Component for Prompt {
self.render_prompt(area, surface, cx) self.render_prompt(area, surface, cx)
} }
fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) { fn cursor(&self, area: Rect, _editor: &Editor) -> (Option<Position>, CursorKind) {
let line = area.height as usize - 1; let line = area.height as usize - 1;
( (
Some(Position::new( Some(Position::new(

@ -1,14 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult}; use crate::compositor::{Component, Context};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use std::borrow::Cow; use helix_view::graphics::Rect;
use helix_core::Position;
use helix_view::{
graphics::{Color, Rect, Style},
Editor,
};
pub struct Text { pub struct Text {
contents: String, contents: String,
@ -20,12 +13,10 @@ impl Text {
} }
} }
impl Component for Text { impl Component for Text {
fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) { fn render(&self, area: Rect, surface: &mut Surface, _cx: &mut Context) {
use tui::widgets::{Paragraph, Widget, Wrap}; use tui::widgets::{Paragraph, Widget, Wrap};
let contents = tui::text::Text::from(self.contents.clone()); let contents = tui::text::Text::from(self.contents.clone());
let style = cx.editor.theme.get("ui.text");
let par = Paragraph::new(contents).wrap(Wrap { trim: false }); let par = Paragraph::new(contents).wrap(Wrap { trim: false });
// .scroll(x, y) offsets // .scroll(x, y) offsets

Loading…
Cancel
Save