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

Use single languages::{rust_lang, markdown_lang} in tests across the codebase (#44282)

Browse Source 
This allows referencing proper queries and keeping the tests up-to-date.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov
2025-12-06 18:49:21 +00:00
committed by GitHub
parent b2e35b5f99
commit 16666f5357
22 changed files with 267 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/debugger_ui/src/tests/inline_values.rs
+56 -65
View File
@@ -4,7 +4,7 @@ use dap::{Scope, StackFrame, Variable, requests::Variables};
use editor::{Editor, EditorMode, MultiBuffer};
use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
use language::{
Language, LanguageConfig, LanguageMatcher, tree_sitter_python, tree_sitter_rust,
Language, LanguageConfig, LanguageMatcher, rust_lang, tree_sitter_python,
tree_sitter_typescript,
};
use project::{FakeFs, Project};
@@ -224,7 +224,7 @@ fn main() {
.unwrap();
buffer.update(cx, |buffer, cx| {
buffer.set_language(Some(Arc::new(rust_lang())), cx);
buffer.set_language(Some(rust_lang()), cx);
});
let (editor, cx) = cx.add_window_view(|window, cx| {
@@ -1521,23 +1521,6 @@ fn main() {
});
}
fn rust_lang() -> Language {
let debug_variables_query = include_str!("../../../languages/src/rust/debugger.scm");
Language::new(
LanguageConfig {
name: "Rust".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["rs".to_string()],
..Default::default()
},
..Default::default()
},
Some(tree_sitter_rust::LANGUAGE.into()),
)
.with_debug_variables_query(debug_variables_query)
.unwrap()
}
#[gpui::test]
async fn test_python_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
init_test(cx);
@@ -1859,21 +1842,23 @@ fn python_lang() -> Language {
.unwrap()
}
fn go_lang() -> Language {
fn go_lang() -> Arc<Language> {
let debug_variables_query = include_str!("../../../languages/src/go/debugger.scm");
Language::new(
LanguageConfig {
name: "Go".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["go".to_string()],
Arc::new(
Language::new(
LanguageConfig {
name: "Go".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["go".to_string()],
..Default::default()
},
..Default::default()
},
..Default::default()
},
Some(tree_sitter_go::LANGUAGE.into()),
Some(tree_sitter_go::LANGUAGE.into()),
)
.with_debug_variables_query(debug_variables_query)
.unwrap(),
)
.with_debug_variables_query(debug_variables_query)
.unwrap()
}
/// Test utility function for inline values testing
@@ -1891,7 +1876,7 @@ async fn test_inline_values_util(
before: &str,
after: &str,
active_debug_line: Option<usize>,
language: Language,
language: Arc<Language>,
executor: BackgroundExecutor,
cx: &mut TestAppContext,
) {
@@ -2091,7 +2076,7 @@ async fn test_inline_values_util(
.unwrap();
buffer.update(cx, |buffer, cx| {
buffer.set_language(Some(Arc::new(language)), cx);
buffer.set_language(Some(language), cx);
});
let (editor, cx) = cx.add_window_view(|window, cx| {
@@ -2276,55 +2261,61 @@ fn main() {
.await;
}
fn javascript_lang() -> Language {
fn javascript_lang() -> Arc<Language> {
let debug_variables_query = include_str!("../../../languages/src/javascript/debugger.scm");
Language::new(
LanguageConfig {
name: "JavaScript".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["js".to_string()],
Arc::new(
Language::new(
LanguageConfig {
name: "JavaScript".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["js".to_string()],
..Default::default()
},
..Default::default()
},
..Default::default()
},
Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
)
.with_debug_variables_query(debug_variables_query)
.unwrap(),
)
.with_debug_variables_query(debug_variables_query)
.unwrap()
}
fn typescript_lang() -> Language {
fn typescript_lang() -> Arc<Language> {
let debug_variables_query = include_str!("../../../languages/src/typescript/debugger.scm");
Language::new(
LanguageConfig {
name: "TypeScript".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["ts".to_string()],
Arc::new(
Language::new(
LanguageConfig {
name: "TypeScript".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["ts".to_string()],
..Default::default()
},
..Default::default()
},
..Default::default()
},
Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
)
.with_debug_variables_query(debug_variables_query)
.unwrap(),
)
.with_debug_variables_query(debug_variables_query)
.unwrap()
}
fn tsx_lang() -> Language {
fn tsx_lang() -> Arc<Language> {
let debug_variables_query = include_str!("../../../languages/src/tsx/debugger.scm");
Language::new(
LanguageConfig {
name: "TSX".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["tsx".to_string()],
Arc::new(
Language::new(
LanguageConfig {
name: "TSX".into(),
matcher: LanguageMatcher {
path_suffixes: vec!["tsx".to_string()],
..Default::default()
},
..Default::default()
},
..Default::default()
},
Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
)
.with_debug_variables_query(debug_variables_query)
.unwrap(),
)
.with_debug_variables_query(debug_variables_query)
.unwrap()
}
#[gpui::test]