andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-25 10:56:19 +04:00
Code Issues Projects Releases Wiki Activity

chore(view): remove indent_unit helper fn (#4389)

Browse Source
This commit is contained in:
Matouš Dzivjak 2022-10-21 00:05:04 +02:00 committed by GitHub
parent 36f97b6aad
commit 4cff625054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helix-term/src/commands.rs
View File

@ -3022,7 +3022,7 @@ pub fn insert_tab(cx: &mut Context) {
// TODO: round out to nearest indentation level (for example a line with 3 spaces should // TODO: round out to nearest indentation level (for example a line with 3 spaces should
// indent by one to reach 4 spaces). // indent by one to reach 4 spaces).
let indent = Tendril::from(doc.indent_unit()); let indent = Tendril::from(doc.indent_style.as_str());
let transaction = Transaction::insert( let transaction = Transaction::insert(
doc.text(), doc.text(),
&doc.selection(view.id).clone().cursors(doc.text().slice(..)), &doc.selection(view.id).clone().cursors(doc.text().slice(..)),
@ -3122,7 +3122,7 @@ pub fn delete_char_backward(cx: &mut Context) {
let count = cx.count(); let count = cx.count();
let (view, doc) = current_ref!(cx.editor); let (view, doc) = current_ref!(cx.editor);
let text = doc.text().slice(..); let text = doc.text().slice(..);
let indent_unit = doc.indent_unit(); let indent_unit = doc.indent_style.as_str();
let tab_size = doc.tab_width(); let tab_size = doc.tab_width();
let auto_pairs = doc.auto_pairs(cx.editor); let auto_pairs = doc.auto_pairs(cx.editor);
@ -3647,7 +3647,7 @@ fn indent(cx: &mut Context) {
let lines = get_lines(doc, view.id); let lines = get_lines(doc, view.id);
// Indent by one level // Indent by one level
let indent = Tendril::from(doc.indent_unit().repeat(count)); let indent = Tendril::from(doc.indent_style.as_str().repeat(count));
let transaction = Transaction::change( let transaction = Transaction::change(
doc.text(), doc.text(),

8
helix-view/src/document.rs
View File

@ -1052,14 +1052,6 @@ pub fn tab_width(&self) -> usize {
.map_or(4, |config| config.tab_width) // fallback to 4 columns .map_or(4, |config| config.tab_width) // fallback to 4 columns
} }
/// Returns a string containing a single level of indentation.
///
/// TODO: we might not need this function anymore, since the information
/// is conveniently available in `Document::indent_style` now.
pub fn indent_unit(&self) -> &'static str {
self.indent_style.as_str()
}
pub fn changes(&self) -> &ChangeSet { pub fn changes(&self) -> &ChangeSet {
&self.changes &self.changes
} }