Respect changes in playground

astral-sh · Mar 26, 2023 · 506511e · 506511e
1 parent 460a7e4
commit 506511e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/crates/ruff_diagnostics/src/fix.rs b/crates/ruff_diagnostics/src/fix.rs
@@ -38,6 +38,14 @@ impl Fix {
     }
 }
 
+impl FromIterator<Edit> for Fix {
+    fn from_iter<T: IntoIterator<Item = Edit>>(iter: T) -> Self {
+        Self {
+            edits: Vec::from_iter(iter),
+        }
+    }
+}
+
 impl From<Edit> for Fix {
     fn from(edit: Edit) -> Self {
         Self { edits: vec![edit] }

diff --git a/crates/ruff_wasm/src/lib.rs b/crates/ruff_wasm/src/lib.rs
@@ -36,16 +36,18 @@ export interface Diagnostic {
         column: number;
     };
     fix: {
-        content: string;
         message: string | null;
-        location: {
-            row: number;
-            column: number;
-        };
-        end_location: {
-            row: number;
-            column: number;
-        };
+        edits: {
+            content: string;
+            location: {
+                row: number;
+                column: number;
+            };
+            end_location: {
+                row: number;
+                column: number;
+            };
+        }[];
     } | null;
 };
 "#;

diff --git a/playground/src/Editor/SourceEditor.tsx b/playground/src/Editor/SourceEditor.tsx
@@ -57,27 +57,27 @@ export default function SourceEditor({
             .filter((check) => check.fix)
             .map((check) => ({
               title: check.fix
-                ? `${check.code}: ${check.fix.message}` ?? `Fix ${check.code}`
+                ? check.fix.message
+                  ? `${check.code}: ${check.fix.message}`
+                  : `Fix ${check.code}`
                 : "Autofix",
               id: `fix-${check.code}`,
               kind: "quickfix",
               edit: check.fix
                 ? {
-                    edits: [
-                      {
-                        resource: model.uri,
-                        versionId: model.getVersionId(),
-                        edit: {
-                          range: {
-                            startLineNumber: check.fix.location.row,
-                            startColumn: check.fix.location.column + 1,
-                            endLineNumber: check.fix.end_location.row,
-                            endColumn: check.fix.end_location.column + 1,
-                          },
-                          text: check.fix.content,
+                    edits: check.fix.edits.map((edit) => ({
+                      resource: model.uri,
+                      versionId: model.getVersionId(),
+                      edit: {
+                        range: {
+                          startLineNumber: edit.location.row,
+                          startColumn: edit.location.column + 1,
+                          endLineNumber: edit.end_location.row,
+                          endColumn: edit.end_location.column + 1,
                         },
+                        text: edit.content,
                       },
-                    ],
+                    })),
                   }
                 : undefined,
             }));