test for TOODs as well

diff --git a/crates/ra_assists/src/raw_string.rs b/crates/ra_assists/src/raw_string.rs
index e0026706012a9dc0e73d0686b6b73ec98117802f..965a64c9870c1836327baa741f1cba7768b66e9e 100644 (file)
--- a/crates/ra_assists/src/raw_string.rs
+++ b/crates/ra_assists/src/raw_string.rs
@@ -1,370 +1,370 @@
-use hir::db::HirDatabase;\r
-use ra_syntax::{ast::AstNode, ast::Literal, TextRange, TextUnit};\r
-\r
-use crate::{Assist, AssistCtx, AssistId};\r
-\r
-pub(crate) fn make_raw_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {\r
-    let literal = ctx.node_at_offset::<Literal>()?;\r
-    if literal.token().kind() != ra_syntax::SyntaxKind::STRING {\r
-        return None;\r
-    }\r
-    ctx.add_action(AssistId("make_raw_string"), "make raw string", |edit| {\r
-        edit.target(literal.syntax().text_range());\r
-        edit.insert(literal.syntax().text_range().start(), "r");\r
-    });\r
-    ctx.build()\r
-}\r
-\r
-fn find_usual_string_range(s: &str) -> Option<TextRange> {\r
-    Some(TextRange::from_to(\r
-        TextUnit::from(s.find('"')? as u32),\r
-        TextUnit::from(s.rfind('"')? as u32),\r
-    ))\r
-}\r
-\r
-pub(crate) fn make_usual_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {\r
-    let literal = ctx.node_at_offset::<Literal>()?;\r
-    if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {\r
-        return None;\r
-    }\r
-    let token = literal.token();\r
-    let text = token.text().as_str();\r
-    let usual_string_range = find_usual_string_range(text)?;\r
-    ctx.add_action(AssistId("make_usual_string"), "make usual string", |edit| {\r
-        edit.target(literal.syntax().text_range());\r
-        // parse inside string to escape `"`\r
-        let start_of_inside = usual_string_range.start().to_usize() + 1;\r
-        let end_of_inside = usual_string_range.end().to_usize();\r
-        let inside_str = &text[start_of_inside..end_of_inside];\r
-        let escaped = inside_str.escape_default().to_string();\r
-        edit.replace(literal.syntax().text_range(), format!("\"{}\"", escaped));\r
-    });\r
-    ctx.build()\r
-}\r
-\r
-pub(crate) fn add_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {\r
-    let literal = ctx.node_at_offset::<Literal>()?;\r
-    if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {\r
-        return None;\r
-    }\r
-    ctx.add_action(AssistId("add_hash"), "add hash to raw string", |edit| {\r
-        edit.target(literal.syntax().text_range());\r
-        edit.insert(literal.syntax().text_range().start() + TextUnit::of_char('r'), "#");\r
-        edit.insert(literal.syntax().text_range().end(), "#");\r
-    });\r
-    ctx.build()\r
-}\r
-\r
-pub(crate) fn remove_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {\r
-    let literal = ctx.node_at_offset::<Literal>()?;\r
-    if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {\r
-        return None;\r
-    }\r
-    let token = literal.token();\r
-    let text = token.text().as_str();\r
-    if text.starts_with("r\"") {\r
-        // no hash to remove\r
-        return None;\r
-    }\r
-    ctx.add_action(AssistId("remove_hash"), "remove hash from raw string", |edit| {\r
-        edit.target(literal.syntax().text_range());\r
-        let result = &text[2..text.len() - 1];\r
-        let result = if result.starts_with("\"") {\r
-            // no more hash, escape\r
-            let internal_str = &result[1..result.len() - 1];\r
-            format!("\"{}\"", internal_str.escape_default().to_string())\r
-        } else {\r
-            result.to_owned()\r
-        };\r
-        edit.replace(literal.syntax().text_range(), format!("r{}", result));\r
-    });\r
-    ctx.build()\r
-}\r
-\r
-#[cfg(test)]\r
-mod test {\r
-    use super::*;\r
-    use crate::helpers::{check_assist, check_assist_not_applicable, check_assist_target};\r
-\r
-    #[test]\r
-    fn make_raw_string_target() {\r
-        check_assist_target(\r
-            make_raw_string,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "#,\r
-            r#""random string""#,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn make_raw_string_works() {\r
-        check_assist(\r
-            make_raw_string,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "#,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random string";\r
-            }\r
-            "#,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn make_raw_string_with_escaped_works() {\r
-        check_assist(\r
-            make_raw_string,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random\nstring";\r
-            }\r
-            "#,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random\nstring";\r
-            }\r
-            "#,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn make_raw_string_not_works() {\r
-        check_assist_not_applicable(\r
-            make_raw_string,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random string";\r
-            }\r
-            "#,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn add_hash_target() {\r
-        check_assist_target(\r
-            add_hash,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random string";\r
-            }\r
-            "#,\r
-            r#"r"random string""#,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn add_hash_works() {\r
-        check_assist(\r
-            add_hash,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random string";\r
-            }\r
-            "#,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random string"#;\r
-            }\r
-            "##,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn add_more_hash_works() {\r
-        check_assist(\r
-            add_hash,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random"string"#;\r
-            }\r
-            "##,\r
-            r###"\r
-            fn f() {\r
-                let s = <|>r##"random"string"##;\r
-            }\r
-            "###,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn add_hash_not_works() {\r
-        check_assist_not_applicable(\r
-            add_hash,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "#,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn remove_hash_target() {\r
-        check_assist_target(\r
-            remove_hash,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random string"#;\r
-            }\r
-            "##,\r
-            r##"r#"random string"#"##,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn remove_hash_works() {\r
-        check_assist(\r
-            remove_hash,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random string"#;\r
-            }\r
-            "##,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random string";\r
-            }\r
-            "#,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn remove_hash_with_quote_works() {\r
-        check_assist(\r
-            remove_hash,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random"str"ing"#;\r
-            }\r
-            "##,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random\"str\"ing";\r
-            }\r
-            "#,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn remove_more_hash_works() {\r
-        check_assist(\r
-            remove_hash,\r
-            r###"\r
-            fn f() {\r
-                let s = <|>r##"random string"##;\r
-            }\r
-            "###,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random string"#;\r
-            }\r
-            "##,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn remove_hash_not_works() {\r
-        check_assist_not_applicable(\r
-            remove_hash,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "#,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn remove_hash_no_hash_not_works() {\r
-        check_assist_not_applicable(\r
-            remove_hash,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>r"random string";\r
-            }\r
-            "#,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn make_usual_string_target() {\r
-        check_assist_target(\r
-            make_usual_string,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random string"#;\r
-            }\r
-            "##,\r
-            r##"r#"random string"#"##,\r
-        );\r
-    }\r
-\r
-    #[test]\r
-    fn make_usual_string_works() {\r
-        check_assist(\r
-            make_usual_string,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random string"#;\r
-            }\r
-            "##,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "#,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn make_usual_string_with_quote_works() {\r
-        check_assist(\r
-            make_usual_string,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>r#"random"str"ing"#;\r
-            }\r
-            "##,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random\"str\"ing";\r
-            }\r
-            "#,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn make_usual_string_more_hash_works() {\r
-        check_assist(\r
-            make_usual_string,\r
-            r###"\r
-            fn f() {\r
-                let s = <|>r##"random string"##;\r
-            }\r
-            "###,\r
-            r##"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "##,\r
-        )\r
-    }\r
-\r
-    #[test]\r
-    fn make_usual_string_not_works() {\r
-        check_assist_not_applicable(\r
-            make_usual_string,\r
-            r#"\r
-            fn f() {\r
-                let s = <|>"random string";\r
-            }\r
-            "#,\r
-        );\r
-    }\r
-}\r
+use hir::db::HirDatabase;
+use ra_syntax::{ast::AstNode, ast::Literal, TextRange, TextUnit};
+
+use crate::{Assist, AssistCtx, AssistId};
+
+pub(crate) fn make_raw_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let literal = ctx.node_at_offset::<Literal>()?;
+    if literal.token().kind() != ra_syntax::SyntaxKind::STRING {
+        return None;
+    }
+    ctx.add_action(AssistId("make_raw_string"), "make raw string", |edit| {
+        edit.target(literal.syntax().text_range());
+        edit.insert(literal.syntax().text_range().start(), "r");
+    });
+    ctx.build()
+}
+
+fn find_usual_string_range(s: &str) -> Option<TextRange> {
+    Some(TextRange::from_to(
+        TextUnit::from(s.find('"')? as u32),
+        TextUnit::from(s.rfind('"')? as u32),
+    ))
+}
+
+pub(crate) fn make_usual_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let literal = ctx.node_at_offset::<Literal>()?;
+    if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
+        return None;
+    }
+    let token = literal.token();
+    let text = token.text().as_str();
+    let usual_string_range = find_usual_string_range(text)?;
+    ctx.add_action(AssistId("make_usual_string"), "make usual string", |edit| {
+        edit.target(literal.syntax().text_range());
+        // parse inside string to escape `"`
+        let start_of_inside = usual_string_range.start().to_usize() + 1;
+        let end_of_inside = usual_string_range.end().to_usize();
+        let inside_str = &text[start_of_inside..end_of_inside];
+        let escaped = inside_str.escape_default().to_string();
+        edit.replace(literal.syntax().text_range(), format!("\"{}\"", escaped));
+    });
+    ctx.build()
+}
+
+pub(crate) fn add_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let literal = ctx.node_at_offset::<Literal>()?;
+    if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
+        return None;
+    }
+    ctx.add_action(AssistId("add_hash"), "add hash to raw string", |edit| {
+        edit.target(literal.syntax().text_range());
+        edit.insert(literal.syntax().text_range().start() + TextUnit::of_char('r'), "#");
+        edit.insert(literal.syntax().text_range().end(), "#");
+    });
+    ctx.build()
+}
+
+pub(crate) fn remove_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let literal = ctx.node_at_offset::<Literal>()?;
+    if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
+        return None;
+    }
+    let token = literal.token();
+    let text = token.text().as_str();
+    if text.starts_with("r\"") {
+        // no hash to remove
+        return None;
+    }
+    ctx.add_action(AssistId("remove_hash"), "remove hash from raw string", |edit| {
+        edit.target(literal.syntax().text_range());
+        let result = &text[2..text.len() - 1];
+        let result = if result.starts_with("\"") {
+            // no more hash, escape
+            let internal_str = &result[1..result.len() - 1];
+            format!("\"{}\"", internal_str.escape_default().to_string())
+        } else {
+            result.to_owned()
+        };
+        edit.replace(literal.syntax().text_range(), format!("r{}", result));
+    });
+    ctx.build()
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::helpers::{check_assist, check_assist_not_applicable, check_assist_target};
+
+    #[test]
+    fn make_raw_string_target() {
+        check_assist_target(
+            make_raw_string,
+            r#"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "#,
+            r#""random string""#,
+        );
+    }
+
+    #[test]
+    fn make_raw_string_works() {
+        check_assist(
+            make_raw_string,
+            r#"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "#,
+            r#"
+            fn f() {
+                let s = <|>r"random string";
+            }
+            "#,
+        )
+    }
+
+    #[test]
+    fn make_raw_string_with_escaped_works() {
+        check_assist(
+            make_raw_string,
+            r#"
+            fn f() {
+                let s = <|>"random\nstring";
+            }
+            "#,
+            r#"
+            fn f() {
+                let s = <|>r"random\nstring";
+            }
+            "#,
+        )
+    }
+
+    #[test]
+    fn make_raw_string_not_works() {
+        check_assist_not_applicable(
+            make_raw_string,
+            r#"
+            fn f() {
+                let s = <|>r"random string";
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn add_hash_target() {
+        check_assist_target(
+            add_hash,
+            r#"
+            fn f() {
+                let s = <|>r"random string";
+            }
+            "#,
+            r#"r"random string""#,
+        );
+    }
+
+    #[test]
+    fn add_hash_works() {
+        check_assist(
+            add_hash,
+            r#"
+            fn f() {
+                let s = <|>r"random string";
+            }
+            "#,
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+        )
+    }
+
+    #[test]
+    fn add_more_hash_works() {
+        check_assist(
+            add_hash,
+            r##"
+            fn f() {
+                let s = <|>r#"random"string"#;
+            }
+            "##,
+            r###"
+            fn f() {
+                let s = <|>r##"random"string"##;
+            }
+            "###,
+        )
+    }
+
+    #[test]
+    fn add_hash_not_works() {
+        check_assist_not_applicable(
+            add_hash,
+            r#"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn remove_hash_target() {
+        check_assist_target(
+            remove_hash,
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+            r##"r#"random string"#"##,
+        );
+    }
+
+    #[test]
+    fn remove_hash_works() {
+        check_assist(
+            remove_hash,
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+            r#"
+            fn f() {
+                let s = <|>r"random string";
+            }
+            "#,
+        )
+    }
+
+    #[test]
+    fn remove_hash_with_quote_works() {
+        check_assist(
+            remove_hash,
+            r##"
+            fn f() {
+                let s = <|>r#"random"str"ing"#;
+            }
+            "##,
+            r#"
+            fn f() {
+                let s = <|>r"random\"str\"ing";
+            }
+            "#,
+        )
+    }
+
+    #[test]
+    fn remove_more_hash_works() {
+        check_assist(
+            remove_hash,
+            r###"
+            fn f() {
+                let s = <|>r##"random string"##;
+            }
+            "###,
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+        )
+    }
+
+    #[test]
+    fn remove_hash_not_works() {
+        check_assist_not_applicable(
+            remove_hash,
+            r#"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn remove_hash_no_hash_not_works() {
+        check_assist_not_applicable(
+            remove_hash,
+            r#"
+            fn f() {
+                let s = <|>r"random string";
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn make_usual_string_target() {
+        check_assist_target(
+            make_usual_string,
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+            r##"r#"random string"#"##,
+        );
+    }
+
+    #[test]
+    fn make_usual_string_works() {
+        check_assist(
+            make_usual_string,
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+            r#"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "#,
+        )
+    }
+
+    #[test]
+    fn make_usual_string_with_quote_works() {
+        check_assist(
+            make_usual_string,
+            r##"
+            fn f() {
+                let s = <|>r#"random"str"ing"#;
+            }
+            "##,
+            r#"
+            fn f() {
+                let s = <|>"random\"str\"ing";
+            }
+            "#,
+        )
+    }
+
+    #[test]
+    fn make_usual_string_more_hash_works() {
+        check_assist(
+            make_usual_string,
+            r###"
+            fn f() {
+                let s = <|>r##"random string"##;
+            }
+            "###,
+            r##"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "##,
+        )
+    }
+
+    #[test]
+    fn make_usual_string_not_works() {
+        check_assist_not_applicable(
+            make_usual_string,
+            r#"
+            fn f() {
+                let s = <|>"random string";
+            }
+            "#,
+        );
+    }
+}

diff --git a/crates/ra_tools/tests/cli.rs b/crates/ra_tools/tests/cli.rs
index c672e578895378e5b4c1f043d22ae2e1c1867926..91b19c8f822a21c78fdb65263586923e4291476d 100644 (file)
--- a/crates/ra_tools/tests/cli.rs
+++ b/crates/ra_tools/tests/cli.rs
@@ -34,7 +34,7 @@ fn no_todo() {
             return;
         }
         let text = std::fs::read_to_string(e.path()).unwrap();
-        if text.contains("TODO") {
+        if text.contains("TODO") || text.contains("TOOD") {
             panic!(
                 "\nTODO markers should not be commited to the master branch,\n\
                  use FIXME instead\n\