Antonio Scandurra created
zed/languages/rust/config.toml | 10 -
zed/src/editor/buffer/mod.rs | 185 ---------------------------------
zed/src/editor/buffer_view.rs | 11 -
zed/src/editor/display_map/mod.rs | 1
zed/src/language.rs | 5
5 files changed, 1 insertion(+), 211 deletions(-)
@@ -1,12 +1,2 @@
name = "Rust"
path_suffixes = ["rs"]
-indent = 4
-
-idents = [
- { inside = "let_declaration" },
- { inside = "field_declaration" },
- { start = "where_clause", end = ["block", "field_declaration_list"] },
- { after = "{", before = "}" },
- { start = "(", end = ")" },
- { start = "[", end = "]" },
-]
@@ -654,7 +654,6 @@ impl Buffer {
}
fn parse_text(text: &Rope, old_tree: Option<Tree>, language: &Language) -> Tree {
- let t0 = std::time::Instant::now();
PARSER.with(|parser| {
let mut parser = parser.borrow_mut();
parser
@@ -670,112 +669,10 @@ impl Buffer {
old_tree.as_ref(),
)
.unwrap();
- eprintln!("parsed in {:?}", t0.elapsed());
tree
})
}
- fn indent_for_row(&self, row: u32) -> (usize, bool) {
- let mut is_whitespace = true;
- let mut indent = 0;
- for c in self.chars_at(Point::new(row, 0)) {
- match c {
- ' ' => indent += 1,
- '\n' => break,
- _ => {
- is_whitespace = false;
- break;
- }
- }
- }
- (indent, is_whitespace)
- }
-
- pub fn autoindent_for_row(&self, row: u32) -> usize {
- // Find the indentation level of the previous non-whitespace row.
- let mut prev_row = row;
- let prev_indent = loop {
- if prev_row == 0 {
- break 0;
- }
- prev_row -= 1;
- let (indent, is_whitespace) = self.indent_for_row(prev_row);
- if !is_whitespace {
- break indent;
- }
- };
-
- let (language, syntax_tree) = match self.language.as_ref().zip(self.syntax_tree()) {
- Some(e) => e,
- None => return prev_indent,
- };
-
- // Find the capture indices in the language's indent query.
- let mut indent_inside_capture_ix = u32::MAX;
- let mut indent_after_capture_ix = u32::MAX;
- let mut indent_until_capture_ix = u32::MAX;
- for (ix, name) in language.indent_query.capture_names().iter().enumerate() {
- *match name.as_ref() {
- "inside" => &mut indent_inside_capture_ix,
- "after" => &mut indent_after_capture_ix,
- "until" => &mut indent_until_capture_ix,
- _ => continue,
- } = ix as u32;
- }
-
- eprintln!("autoindent for row: {}", row);
-
- // Find all of the indentation nodes intersecting the previous and current row.
- let mut does_start_indent = false;
- let mut start_row_of_most_recent_ending_indent = None;
- let mut cursor = acquire_query_cursor();
- cursor.set_point_range(
- Point::new(prev_row, 0).into(),
- Point::new(row + 1, 0).into(),
- );
- for mat in cursor.matches(
- &language.indent_query,
- syntax_tree.root_node(),
- TextProvider(&self.visible_text),
- ) {
- let mut row_range = 0..self.row_count();
- eprintln!(" match: {:?}", mat);
-
- for capture in mat.captures {
- let node_start_row = capture.node.start_position().row as u32;
- let node_end_row = capture.node.end_position().row as u32;
- if capture.index == indent_inside_capture_ix {
- row_range.start = row_range.start.max(node_start_row + 1);
- row_range.end = row_range.end.min(node_end_row + 1);
- } else if capture.index == indent_after_capture_ix {
- row_range.start = row_range.start.max(node_end_row + 1);
- } else if capture.index == indent_until_capture_ix {
- row_range.end = row_range.end.min(node_start_row);
- }
- }
-
- eprintln!(" row_range: {:?}", row_range);
-
- if row_range.contains(&row) {
- does_start_indent = true;
- } else if !row_range.is_empty() && row_range.end == row {
- start_row_of_most_recent_ending_indent = Some(
- start_row_of_most_recent_ending_indent
- .unwrap_or(0)
- .max(row_range.start),
- );
- }
- }
-
- if does_start_indent {
- prev_indent + language.config.indent
- } else if let Some(start_row) = start_row_of_most_recent_ending_indent {
- self.indent_for_row(start_row).0
- } else {
- prev_indent
- }
- }
-
fn diff(&self, new_text: Arc<str>, ctx: &AppContext) -> Task<Diff> {
// TODO: it would be nice to not allocate here.
let old_text = self.text();
@@ -2745,7 +2642,6 @@ impl ToPoint for usize {
mod tests {
use super::*;
use crate::{
- language::LanguageConfig,
test::{build_app_state, temp_tree},
util::RandomCharIter,
worktree::{Worktree, WorktreeHandle},
@@ -2760,7 +2656,6 @@ mod tests {
rc::Rc,
sync::atomic::{self, AtomicUsize},
};
- use unindent::Unindent as _;
#[gpui::test]
fn test_edit(ctx: &mut gpui::MutableAppContext) {
@@ -3746,86 +3641,6 @@ mod tests {
}
}
- #[gpui::test]
- async fn test_autoindent(mut ctx: gpui::TestAppContext) {
- let grammar = tree_sitter_rust::language();
- let lang = Arc::new(Language {
- config: LanguageConfig {
- indent: 4,
- ..Default::default()
- },
- grammar: grammar.clone(),
- highlight_query: tree_sitter::Query::new(grammar, "").unwrap(),
- indent_query: tree_sitter::Query::new(
- grammar,
- r#"
- (field_expression) @inside
- (let_declaration) @inside
- ((_ . "where" @after) _ @until)
- (_ "{" @after "}" @until)
- (_ "(" @after ")" @until)
- "#,
- )
- .unwrap(),
- theme_mapping: Default::default(),
- });
-
- let examples = vec![
- "
- fn a() {
- b(
- c,
- d
- )
- e(|f| {
- g();
- h(|| {
- i();
- })
- j();
- });
- k();
- }
- "
- .unindent(),
- "
- fn a<B, C>(
- d: e
- ) -> D
- where
- B: E,
- C: F
- {
- a
- .b
- .c
- .d
- }
- "
- .unindent(),
- ];
-
- for (example_ix, text) in examples.into_iter().enumerate() {
- let buffer = ctx.add_model(|ctx| {
- Buffer::from_history(0, History::new(text.into()), None, Some(lang.clone()), ctx)
- });
- buffer.condition(&ctx, |buf, _| !buf.is_parsing()).await;
-
- buffer.read_with(&ctx, |buffer, _| {
- for row in 0..buffer.row_count() {
- assert_eq!(
- buffer.autoindent_for_row(row),
- buffer.indent_for_row(row).0,
- "wrong autoindent for example {}, row {}, line {:?}",
- example_ix,
- row,
- buffer.text().split('\n').skip(row as usize).next().unwrap(),
- );
- }
- });
- }
- }
-
impl Buffer {
fn random_byte_range(&mut self, start_offset: usize, rng: &mut impl Rng) -> Range<usize> {
let end = self.clip_offset(rng.gen_range(start_offset..=self.len()), Bias::Right);
@@ -41,7 +41,7 @@ pub fn init(app: &mut MutableAppContext) {
Binding::new("delete", "buffer:delete", Some("BufferView")),
Binding::new("ctrl-d", "buffer:delete", Some("BufferView")),
Binding::new("enter", "buffer:newline", Some("BufferView")),
- Binding::new("tab", "buffer:print_autoindents", Some("BufferView")),
+ Binding::new("tab", "buffer:insert", Some("BufferView")).with_arg("\t".to_string()),
Binding::new("ctrl-shift-K", "buffer:delete_line", Some("BufferView")),
Binding::new(
"alt-backspace",
@@ -177,7 +177,6 @@ pub fn init(app: &mut MutableAppContext) {
),
]);
- app.add_action("buffer:print_autoindents", BufferView::print_autoindents);
app.add_action("buffer:scroll", BufferView::scroll);
app.add_action("buffer:select", BufferView::select);
app.add_action("buffer:cancel", BufferView::cancel);
@@ -639,14 +638,6 @@ impl BufferView {
Ok(())
}
- pub fn print_autoindents(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
- let buf = self.buffer.read(ctx);
- eprintln!("autoindents:");
- for row in 0..buf.row_count() {
- eprintln!(" {}: {}", row, buf.autoindent_for_row(row));
- }
- }
-
pub fn insert(&mut self, text: &String, ctx: &mut ViewContext<Self>) {
let mut old_selections = SmallVec::<[_; 32]>::new();
{
@@ -531,7 +531,6 @@ mod tests {
},
grammar: grammar.clone(),
highlight_query,
- indent_query: tree_sitter::Query::new(grammar, "").unwrap(),
theme_mapping: Default::default(),
});
lang.set_theme(&theme);
@@ -13,7 +13,6 @@ pub struct LanguageDir;
#[derive(Default, Deserialize)]
pub struct LanguageConfig {
pub name: String,
- pub indent: usize,
pub path_suffixes: Vec<String>,
}
@@ -21,7 +20,6 @@ pub struct Language {
pub config: LanguageConfig,
pub grammar: Grammar,
pub highlight_query: Query,
- pub indent_query: Query,
pub theme_mapping: Mutex<ThemeMap>,
}
@@ -47,7 +45,6 @@ impl LanguageRegistry {
config: rust_config,
grammar,
highlight_query: Self::load_query(grammar, "rust/highlights.scm"),
- indent_query: Self::load_query(grammar, "rust/indents.scm"),
theme_mapping: Mutex::new(ThemeMap::default()),
};
@@ -102,7 +99,6 @@ mod tests {
},
grammar,
highlight_query: Query::new(grammar, "").unwrap(),
- indent_query: Query::new(grammar, "").unwrap(),
theme_mapping: Default::default(),
}),
Arc::new(Language {
@@ -113,7 +109,6 @@ mod tests {
},
grammar,
highlight_query: Query::new(grammar, "").unwrap(),
- indent_query: Query::new(grammar, "").unwrap(),
theme_mapping: Default::default(),
}),
],