use add_wip assist

Summary: Update the testing machinery to be able to also apply fixes generated in code action fixes.

Reviewed By: perehonchuk

Differential Revision: D55967115

fbshipit-source-id: a946bfa9b5759aa19ea2f377117cd87225398efb

crates/ide/src/diagnostics.rs

@@ -237,40 +237,6 @@ impl Diagnostic {
         self
     }
 
-    #[allow(dead_code)] // @oss-only
-    pub(crate) fn with_fixme_fix(mut self, sema: &Semantic, file_id: FileId) -> Diagnostic {
-        let mut builder = TextEdit::builder();
-        let parsed = sema.parse(file_id);
-        if let Some(token) = parsed
-            .value
-            .syntax()
-            .token_at_offset(self.range.start())
-            .right_biased()
-        {
-            let indent = IndentLevel::from_token(&token);
-            let text = format!("\n{}% elp:fixme {}", indent, self.code.as_labeled_code(),);
-
-            let offset = start_of_line(&token);
-            builder.insert(offset, text);
-            let edit = builder.finish();
-            let source_change = SourceChange::from_text_edit(file_id, edit);
-            let ignore_fix = Assist {
-                id: AssistId("add_fixme", AssistKind::QuickFix),
-                label: Label::new("Add Fixme comment"),
-                group: Some(GroupLabel::ignore()),
-                target: self.range,
-                source_change: Some(source_change),
-                user_input: None,
-                original_diagnostic: None,
-            };
-            match &mut self.fixes {
-                Some(fixes) => fixes.push(ignore_fix),
-                None => self.fixes = Some(vec![ignore_fix]),
-            };
-        }
-        self
-    }
-
     pub fn print(&self, line_index: &LineIndex) -> String {
         let start = line_index.line_col(self.range.start());
         let end = line_index.line_col(self.range.end());

crates/ide/src/diagnostics/head_mismatch.rs

@@ -354,6 +354,7 @@ mod tests {
     use crate::diagnostics::DiagnosticsConfig;
     use crate::tests::check_diagnostics_with_config;
     use crate::tests::check_nth_fix;
+    use crate::tests::IncludeCodeActionAssists;
 
     #[track_caller]
     fn check_diagnostics(ra_fixture: &str) {
@@ -370,7 +371,13 @@ mod tests {
             .disable(DiagnosticCode::MissingCompileWarnMissingSpec)
             .disable(DiagnosticCode::Unexpected("unexpected_semi".to_string()))
             .disable(DiagnosticCode::Unexpected("unexpected_dot".to_string()));
-        check_nth_fix(0, fixture_before, fixture_after, config);
+        check_nth_fix(
+            0,
+            fixture_before,
+            fixture_after,
+            config,
+            IncludeCodeActionAssists::No,
+        );
     }
 
     // The followings tests exercise head_mismatch function indirectly.

crates/ide/src/tests.rs

@@ -129,7 +129,13 @@ pub(crate) fn check_fix(fixture_before: &str, fixture_after: &str) {
     let config = DiagnosticsConfig::default()
         .disable(DiagnosticCode::MissingCompileWarnMissingSpec)
         .set_experimental(true);
-    check_nth_fix(0, fixture_before, fixture_after, config);
+    check_nth_fix(
+        0,
+        fixture_before,
+        fixture_after,
+        config,
+        IncludeCodeActionAssists::No,
+    );
 }
 
 ///  Like `check_fix` but with a custom DiagnosticsConfig
@@ -139,7 +145,33 @@ pub(crate) fn check_fix_with_config(
     fixture_before: &str,
     fixture_after: &str,
 ) {
-    check_nth_fix(0, fixture_before, fixture_after, config);
+    check_nth_fix(
+        0,
+        fixture_before,
+        fixture_after,
+        config,
+        IncludeCodeActionAssists::No,
+    );
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum IncludeCodeActionAssists {
+    Yes,
+    No,
+}
+
+#[track_caller]
+pub(crate) fn check_fix_including_assists(fixture_before: &str, fixture_after: &str) {
+    let config = DiagnosticsConfig::default()
+        .disable(DiagnosticCode::MissingCompileWarnMissingSpec)
+        .set_experimental(true);
+    check_nth_fix(
+        0,
+        fixture_before,
+        fixture_after,
+        config,
+        IncludeCodeActionAssists::Yes,
+    )
 }
 
 #[track_caller]
@@ -148,6 +180,7 @@ pub(crate) fn check_nth_fix(
     fixture_before: &str,
     fixture_after: &str,
     config: DiagnosticsConfig,
+    include_assists: IncludeCodeActionAssists,
 ) {
     let after = trim_indent(fixture_after);
 
@@ -161,7 +194,11 @@ pub(crate) fn check_nth_fix(
         .last()
         .expect("no diagnostics")
         .clone();
-    let fix = &diagnostic.fixes.expect("diagnostic misses fixes")[nth];
+    let fixes = match include_assists {
+        IncludeCodeActionAssists::Yes => diagnostic.get_diagnostic_fixes(&analysis.db, pos.file_id),
+        IncludeCodeActionAssists::No => diagnostic.fixes.expect("diagnostic misses fixes"),
+    };
+    let fix = &fixes[nth];
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();

crates/ide_db/src/diagnostic_code.rs

@@ -278,7 +278,7 @@ impl DiagnosticCode {
             DiagnosticCode::ErlangService(_) => false,
             DiagnosticCode::Eqwalizer(_) => false,
             DiagnosticCode::AdHoc(_) => false,
-            DiagnosticCode::MetaOnly(_) => false,
+            DiagnosticCode::MetaOnly(code) => code.allows_fixme_comment(),
         }
     }
 }