Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for detecting tests in source files, and implement it for Rust #11195

Merged
merged 31 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a60785c
Wire in new language query
mikayla-maki Apr 23, 2024
e5f9780
add tree sitter query implementation
mikayla-maki Apr 24, 2024
fade2f4
WIP: Get git blame menu rendering
mikayla-maki Apr 24, 2024
266949d
Fix up CI
osiewicz Apr 25, 2024
dee6b56
fixup! Fix up CI
osiewicz Apr 25, 2024
3d41adf
Wire through inventory querying
osiewicz Apr 25, 2024
8aac108
fixup! Wire through inventory querying
osiewicz Apr 25, 2024
4abd55d
Finish collecting data to be able to spawn tasks
mikayla-maki Apr 25, 2024
551c5ab
WIP: adjust code actions menu to include tasks
mikayla-maki Apr 26, 2024
8d05ee9
Fix up build and a bunch of warnings
osiewicz Apr 26, 2024
893b0eb
Strip unused deps
osiewicz Apr 26, 2024
c128c3a
fix clippy lint
osiewicz Apr 26, 2024
e4781ce
Remove TestTaskSource
osiewicz Apr 26, 2024
af555a6
Get rid of cx and TaskSource trait
osiewicz Apr 26, 2024
de0c8bc
Remove moot import
osiewicz Apr 26, 2024
6486bb7
Add elided lifetime to make merging with code-actions seamless
osiewicz Apr 26, 2024
527b295
Merge branch 'testing-infra' into testing-infra-code-actions-change
osiewicz Apr 26, 2024
c62010a
Fix up compilation
osiewicz Apr 26, 2024
2f651a2
Get code actions menu to render
osiewicz Apr 29, 2024
58411c9
Spawn tasks from context menu
osiewicz Apr 29, 2024
7cd200c
Use resolved labels, register tasks with history
osiewicz Apr 29, 2024
339154f
Fix papercuts
osiewicz Apr 29, 2024
07ec027
Add one-click spawning of tasks when there's just one candidate
osiewicz Apr 30, 2024
80e5f91
Merge branch 'main' into testing-infra-code-actions-change
osiewicz Apr 30, 2024
8d444c6
Clippy fixes
osiewicz Apr 30, 2024
7e9e842
Fix rendering of test indicators
osiewicz Apr 30, 2024
1a4710d
Use task starting column as location for context evaluation
osiewicz Apr 30, 2024
f8222c8
Remove row type alias
osiewicz Apr 30, 2024
9e92b60
Merge branch 'main' into testing-infra-code-actions-change
osiewicz May 5, 2024
d9a4fa1
Do not display test indicators (nor query them) in remote projects
osiewicz May 5, 2024
2094697
Merge branch 'main' into testing-infra-code-actions-change
osiewicz May 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/collab/src/tests/editor_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ async fn test_collaborating_with_code_actions(
editor_b.update(cx_b, |editor, cx| {
editor.toggle_code_actions(
&ToggleCodeActions {
deployed_from_indicator: false,
deployed_from_indicator: None,
},
cx,
);
Expand Down
1 change: 1 addition & 0 deletions crates/editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ smallvec.workspace = true
smol.workspace = true
snippet.workspace = true
sum_tree.workspace = true
task.workspace = true
text.workspace = true
time.workspace = true
time_format.workspace = true
Expand Down
8 changes: 7 additions & 1 deletion crates/editor/src/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ pub struct SelectToEndOfLine {
#[derive(PartialEq, Clone, Deserialize, Default)]
pub struct ToggleCodeActions {
#[serde(default)]
pub deployed_from_indicator: bool,
pub deployed_from_indicator: Option<u32>,
}

#[derive(PartialEq, Clone, Deserialize, Default)]
pub struct ToggleTestRunner {
#[serde(default)]
pub deployed_from_row: Option<u32>,
}

#[derive(PartialEq, Clone, Deserialize, Default)]
Expand Down