suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: move all comment integration tests into a separate module

pull/12759/head
Nikita Revenco 2025-02-02 19:47:27 +00:00 committed by Nik Revenco
parent ad3f9ececb
commit c22eba38d5
3 changed files with 413 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helix-term/tests/integration.rs
View File

@ -19,6 +19,7 @@ mod test {
mod auto_pairs;
mod command_line;
mod commands;
mod comments;
mod languages;
mod movement;
mod splits;

405
helix-term/tests/test/commands.rs
View File

@ -653,411 +653,6 @@ async fn test_join_selections_space() -> anyhow::Result<()> {
Ok(())
}
/// Comment and uncomment
#[tokio::test(flavor = "multi_thread")]
async fn test_injected_comment_tokens_simple() -> anyhow::Result<()> {
// Uncomment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Comment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Block comment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|/* on this line s */]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Block uncomment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|/* on this line s */]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
Ok(())
}
/// Selections in different regions
#[tokio::test(flavor = "multi_thread")]
async fn test_injected_comment_tokens_multiple_selections() -> anyhow::Result<()> {
// Comments two different injection layers with different comments
test((
indoc! {r#"\
<p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<!-- <p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p> -->
<script type="text/javascript">
// Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Uncomments two different injection layers with different comments
test((
indoc! {r#"\
<!-- <p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p> -->
<script type="text/javascript">
// Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Works with multiple selections
test((
indoc! {r#"\
<p>Comment toggle #(|on this line )#should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line ]#should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<!-- <p>Comment toggle #(|on this line )#should use the HTML comment token(s).</p> -->
<script type="text/javascript">
Comment toggle #[|on this line ]#should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Works with nested injection layers: html, js then css
test((
indoc! {r#"\
<!-- <p>Comment toggle #(|on this line)# should use the HTML comment token(s).</p> -->
<script type="text/javascript">
// Comment toggle #(|on this line)# should use the javascript comment token(s).
foo();
css`
h#[tml {
background-color: |]#red;
}
`
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle #(|on this line)# should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #(|on this line)# should use the javascript comment token(s).
foo();
css`
/* h#[tml { */
/* background-color: |]#red; */
}
`
</script>
"#},
))
.await?;
// Works with block comment toggle across different layers
test((
indoc! {r#"\
<p>Comment toggle #(|on this line)# should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line]# should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment toggle #(|<!-- on this line -->)# should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|/* on this line */]# should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Many selections on the same line
test((
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
))
.await?;
test((
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
))
.await?;
// Many single-selections
test((
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// C#(|o)#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the javascript c#(|o)#mment t#(|o)#ken(s).
f#(|o)##(|o)#();
css`
html {
backgr#(|o)#und-c#(|o)#l#(|o)#r: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// C#(|/* o */)#mment t#(|/* o */)#ggle #(|/* o */)#n this line sh#(|/* o */)#uld use the javascript c#(|/* o */)#mment t#(|/* o */)#ken(s).
f#(|/* o */)##(|/* o */)#();
css`
html {
backgr#(|/* o */)#und-c#(|/* o */)#l#(|/* o */)#r: red;
}
`;
</script>
"#},
))
.await?;
test((
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// C#(|/* o */)#mment t#(|/* o */)#ggle #(|/* o */)#n this line sh#(|/* o */)#uld use the javascript c#(|/* o */)#mment t#(|/* o */)#ken(s).
f#(|/* o */)##(|/* o */)#();
css`
html {
backgr#(|/* o */)#und-c#(|/* o */)#l#(|/* o */)#r: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// C#(|o)#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the javascript c#(|o)#mment t#(|o)#ken(s).
f#(|o)##(|o)#();
css`
html {
backgr#(|o)#und-c#(|o)#l#(|o)#r: red;
}
`;
</script>
"#},
))
.await?;
Ok(())
}
/// A selection that spans across several injections takes comment tokens
/// from the injection with the bigger scope
#[tokio::test(flavor = "multi_thread")]
async fn test_injected_comment_tokens_selection_across_different_layers() -> anyhow::Result<()> {
test((
indoc! {r#"\
<p>Comment tog#[|gle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment togg]#le on this line should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<!-- <p>Comment tog#[|gle on this line should use the HTML comment token(s).</p> -->
<!-- <script type="text/javascript"> -->
<!-- // Comment togg]#le on this line should use the javascript comment token(s). -->
foo();
</script>
"#},
))
.await?;
test((
indoc! {r#"\
<p>Comment tog#[|gle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment togg]#le on this line should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment tog#[|<!-- gle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment togg -->]#le on this line should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_join_selections_comment() -> anyhow::Result<()> {
test((
indoc! {"\
/// #[a|]#bc
/// def
"},
":lang rust<ret>J",
indoc! {"\
/// #[a|]#bc def
"},
))
.await?;
// Only join if the comment token matches the previous line.
test((
indoc! {"\
#[| // a
// b
/// c
/// d
e
/// f
// g]#
"},
":lang rust<ret>J",
indoc! {"\
#[| // a b /// c d e f // g]#
"},
))
.await?;
test((
"#[|\t// Join comments
\t// with indent]#",
":lang go<ret>J",
"#[|\t// Join comments with indent]#",
))
.await?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_read_file() -> anyhow::Result<()> {
let mut file = tempfile::NamedTempFile::new()?;

412
helix-term/tests/test/comments.rs 100644
View File

@ -0,0 +1,412 @@
use helix_term::application::Application;
use super::*;
mod insert;
mod movement;
mod write;
/// Comment and uncomment
#[tokio::test(flavor = "multi_thread")]
async fn test_injected_comment_tokens_simple() -> anyhow::Result<()> {
// Uncomment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Comment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Block comment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|/* on this line s */]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Block uncomment inner injection
test((
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|/* on this line s */]#hould use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment toggle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line s]#hould use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
Ok(())
}
/// Selections in different regions
#[tokio::test(flavor = "multi_thread")]
async fn test_injected_comment_tokens_multiple_selections() -> anyhow::Result<()> {
// Comments two different injection layers with different comments
test((
indoc! {r#"\
<p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<!-- <p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p> -->
<script type="text/javascript">
// Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Uncomments two different injection layers with different comments
test((
indoc! {r#"\
<!-- <p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p> -->
<script type="text/javascript">
// Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle #[|on this line ]#should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #(|on this line )#should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Works with multiple selections
test((
indoc! {r#"\
<p>Comment toggle #(|on this line )#should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line ]#should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<!-- <p>Comment toggle #(|on this line )#should use the HTML comment token(s).</p> -->
<script type="text/javascript">
Comment toggle #[|on this line ]#should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Works with nested injection layers: html, js then css
test((
indoc! {r#"\
<!-- <p>Comment toggle #(|on this line)# should use the HTML comment token(s).</p> -->
<script type="text/javascript">
// Comment toggle #(|on this line)# should use the javascript comment token(s).
foo();
css`
h#[tml {
background-color: |]#red;
}
`
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<p>Comment toggle #(|on this line)# should use the HTML comment token(s).</p>
<script type="text/javascript">
Comment toggle #(|on this line)# should use the javascript comment token(s).
foo();
css`
/* h#[tml { */
/* background-color: |]#red; */
}
`
</script>
"#},
))
.await?;
// Works with block comment toggle across different layers
test((
indoc! {r#"\
<p>Comment toggle #(|on this line)# should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|on this line]# should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment toggle #(|<!-- on this line -->)# should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment toggle #[|/* on this line */]# should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
// Many selections on the same line
test((
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
))
.await?;
test((
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// Comment toggle on this line should use the javascript comment token(s).
foo();
css`
html {
background-color: red;
}
`;
</script>
"#},
))
.await?;
// Many single-selections
test((
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// C#(|o)#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the javascript c#(|o)#mment t#(|o)#ken(s).
f#(|o)##(|o)#();
css`
html {
backgr#(|o)#und-c#(|o)#l#(|o)#r: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// C#(|/* o */)#mment t#(|/* o */)#ggle #(|/* o */)#n this line sh#(|/* o */)#uld use the javascript c#(|/* o */)#mment t#(|/* o */)#ken(s).
f#(|/* o */)##(|/* o */)#();
css`
html {
backgr#(|/* o */)#und-c#(|/* o */)#l#(|/* o */)#r: red;
}
`;
</script>
"#},
))
.await?;
test((
indoc! {r#"\
<p>C#[|<!-- o -->]#mment t#(|<!-- o -->)#ggle #(|<!-- o -->)#n this line sh#(|<!-- o -->)#uld use the HTML c#(|<!-- o -->)#mment t#(|<!-- o -->)#ken(s).</p>
<script type="text/javascript">
// C#(|/* o */)#mment t#(|/* o */)#ggle #(|/* o */)#n this line sh#(|/* o */)#uld use the javascript c#(|/* o */)#mment t#(|/* o */)#ken(s).
f#(|/* o */)##(|/* o */)#();
css`
html {
backgr#(|/* o */)#und-c#(|/* o */)#l#(|/* o */)#r: red;
}
`;
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>C#[|o]#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the HTML c#(|o)#mment t#(|o)#ken(s).</p>
<script type="text/javascript">
// C#(|o)#mment t#(|o)#ggle #(|o)#n this line sh#(|o)#uld use the javascript c#(|o)#mment t#(|o)#ken(s).
f#(|o)##(|o)#();
css`
html {
backgr#(|o)#und-c#(|o)#l#(|o)#r: red;
}
`;
</script>
"#},
))
.await?;
Ok(())
}
/// A selection that spans across several injections takes comment tokens
/// from the injection with the bigger scope
#[tokio::test(flavor = "multi_thread")]
async fn test_injected_comment_tokens_selection_across_different_layers() -> anyhow::Result<()> {
test((
indoc! {r#"\
<p>Comment tog#[|gle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment togg]#le on this line should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> c",
indoc! {r#"\
<!-- <p>Comment tog#[|gle on this line should use the HTML comment token(s).</p> -->
<!-- <script type="text/javascript"> -->
<!-- // Comment togg]#le on this line should use the javascript comment token(s). -->
foo();
</script>
"#},
))
.await?;
test((
indoc! {r#"\
<p>Comment tog#[|gle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment togg]#le on this line should use the javascript comment token(s).
foo();
</script>
"#},
":lang html<ret> C",
indoc! {r#"\
<p>Comment tog#[|<!-- gle on this line should use the HTML comment token(s).</p>
<script type="text/javascript">
// Comment togg -->]#le on this line should use the javascript comment token(s).
foo();
</script>
"#},
))
.await?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_join_selections_comment() -> anyhow::Result<()> {
test((
indoc! {"\
/// #[a|]#bc
/// def
"},
":lang rust<ret>J",
indoc! {"\
/// #[a|]#bc def
"},
))
.await?;
// Only join if the comment token matches the previous line.
test((
indoc! {"\
#[| // a
// b
/// c
/// d
e
/// f
// g]#
"},
":lang rust<ret>J",
indoc! {"\
#[| // a b /// c d e f // g]#
"},
))
.await?;
test((
"#[|\t// Join comments
\t// with indent]#",
":lang go<ret>J",
"#[|\t// Join comments with indent]#",
))
.await?;
Ok(())
}