oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buffer: Keep the shorter language setting names for the common operation (#43915)

Browse Source 
cc
https://github.com/zed-industries/zed/pull/43888#issuecomment-3597265087

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth
2025-12-01 18:55:33 +01:00
committed by GitHub
parent 465536644c
commit 628c52a96a
54 changed files with 219 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/languages/src/bash.rs
+1 -1
View File
@@ -40,7 +40,7 @@ mod tests {
});
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
let expect_indents_to =
|buffer: &mut Buffer, cx: &mut Context<Buffer>, input: &str, expected: &str| {
crates/languages/src/c.rs
+2 -2
View File
@@ -388,7 +388,7 @@ mod tests {
let language = crate::language("c", tree_sitter_c::LANGUAGE.into());
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
buffer.edit([(0..0, "int main() {}")], None, cx);
@@ -418,7 +418,7 @@ mod tests {
let language = crate::language("c", tree_sitter_c::LANGUAGE.into());
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
buffer.edit(
[(
crates/languages/src/cpp.rs
+2 -2
View File
@@ -20,7 +20,7 @@ mod tests {
let language = crate::language("cpp", tree_sitter_cpp::LANGUAGE.into());
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
buffer.edit([(0..0, "int main() {}")], None, cx);
@@ -50,7 +50,7 @@ mod tests {
let language = crate::language("cpp", tree_sitter_cpp::LANGUAGE.into());
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
buffer.edit(
[(
crates/languages/src/css.rs
+1 -2
View File
@@ -224,8 +224,7 @@ mod tests {
"#
.unindent();
let buffer =
cx.new(|cx| language::Buffer::local(text, cx).with_language_immediate(language, cx));
let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
assert_eq!(
outline
crates/languages/src/go.rs
+14 -22
View File
@@ -868,9 +868,8 @@ mod tests {
}
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(testify_suite, cx).with_language_immediate(language.clone(), cx)
});
let buffer = cx
.new(|cx| crate::Buffer::local(testify_suite, cx).with_language(language.clone(), cx));
cx.executor().run_until_parked();
let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
@@ -927,8 +926,7 @@ mod tests {
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(interpreted_string_subtest, cx)
.with_language_immediate(language.clone(), cx)
crate::Buffer::local(interpreted_string_subtest, cx).with_language(language.clone(), cx)
});
cx.executor().run_until_parked();
@@ -957,8 +955,7 @@ mod tests {
);
let buffer = cx.new(|cx| {
crate::Buffer::local(raw_string_subtest, cx)
.with_language_immediate(language.clone(), cx)
crate::Buffer::local(raw_string_subtest, cx).with_language(language.clone(), cx)
});
cx.executor().run_until_parked();
@@ -1002,9 +999,8 @@ mod tests {
}
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(example_test, cx).with_language_immediate(language.clone(), cx)
});
let buffer =
cx.new(|cx| crate::Buffer::local(example_test, cx).with_language(language.clone(), cx));
cx.executor().run_until_parked();
let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
@@ -1074,9 +1070,8 @@ mod tests {
}
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(table_test, cx).with_language_immediate(language.clone(), cx)
});
let buffer =
cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
cx.executor().run_until_parked();
let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
@@ -1143,9 +1138,8 @@ mod tests {
}
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(table_test, cx).with_language_immediate(language.clone(), cx)
});
let buffer =
cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
cx.executor().run_until_parked();
let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
@@ -1216,9 +1210,8 @@ mod tests {
}
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(table_test, cx).with_language_immediate(language.clone(), cx)
});
let buffer =
cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
cx.executor().run_until_parked();
let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
@@ -1284,9 +1277,8 @@ mod tests {
}
"#;
let buffer = cx.new(|cx| {
crate::Buffer::local(table_test, cx).with_language_immediate(language.clone(), cx)
});
let buffer =
cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
cx.executor().run_until_parked();
let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
crates/languages/src/python.rs
+1 -1
View File
@@ -2326,7 +2326,7 @@ mod tests {
});
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
let append = |buffer: &mut Buffer, text: &str, cx: &mut Context<Buffer>| {
let ix = buffer.len();
buffer.edit([(ix..ix, text)], Some(AutoindentMode::EachLine), cx);
crates/languages/src/rust.rs
+1 -1
View File
@@ -1605,7 +1605,7 @@ mod tests {
let language = crate::language("rust", tree_sitter_rust::LANGUAGE.into());
cx.new(|cx| {
let mut buffer = Buffer::local("", cx).with_language_immediate(language, cx);
let mut buffer = Buffer::local("", cx).with_language(language, cx);
// indent between braces
buffer.set_text("fn a() {}", cx);
crates/languages/src/typescript.rs
+5 -10
View File
@@ -895,8 +895,7 @@ mod tests {
"#
.unindent();
let buffer = cx
.new(|cx| language::Buffer::local(text, cx).with_language_immediate(language, cx));
let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
assert_eq!(
outline
@@ -955,8 +954,7 @@ mod tests {
"#
.unindent();
let buffer = cx
.new(|cx| language::Buffer::local(text, cx).with_language_immediate(language, cx));
let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
assert_eq!(
outline
@@ -1028,8 +1026,7 @@ mod tests {
"#
.unindent();
let buffer = cx
.new(|cx| language::Buffer::local(text, cx).with_language_immediate(language, cx));
let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
assert_eq!(
outline
@@ -1109,8 +1106,7 @@ mod tests {
"#
.unindent();
let buffer = cx
.new(|cx| language::Buffer::local(text, cx).with_language_immediate(language, cx));
let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
assert_eq!(
outline
@@ -1181,8 +1177,7 @@ mod tests {
"#
.unindent();
let buffer =
cx.new(|cx| language::Buffer::local(text, cx).with_language_immediate(language, cx));
let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
assert_eq!(
outline