try to fix issues with annotations

auguwu · Aug 16, 2023 · a5ee754 · a5ee754
1 parent 7a58e31
commit a5ee754
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/build/index.js b/build/index.js
diff --git a/src/clippy.ts b/src/clippy.ts
@@ -85,14 +85,14 @@ export const getClippyOutput = async (
     const execOptions: ExecOptions = {
         ignoreReturnCode: true,
         failOnStdErr: false,
-        silent: false,
+        silent: true,
         listeners: {
             stdline(piece) {
                 try {
                     JSON.parse(piece);
                     data.push(piece);
                 } catch (e) {
-                    assertIsError(e);
+                    console.log(piece);
                 }
             }
         }
@@ -180,26 +180,14 @@ export const renderMessages = async (pieces: string[], renderer: Renderer = kDef
                     ? [message.rendered]
                     : [
                           message.rendered,
-
-                          // We shouldn't include file as tests will be flaky
-                          // in CI, so it'll only show up if it was
-                          // actually ran.
-                          process.env.VITEST === 'true'
-                              ? ({
-                                    startColumn: primarySpan.column_start,
-                                    endColumn: primarySpan.column_end,
-                                    startLine: primarySpan.line_start,
-                                    endLine: primarySpan.line_end,
-                                    title: message.message
-                                } satisfies AnnotationProperties)
-                              : ({
-                                    startColumn: primarySpan.column_start,
-                                    endColumn: primarySpan.column_end,
-                                    startLine: primarySpan.line_start,
-                                    endLine: primarySpan.line_end,
-                                    title: message.message,
-                                    file: data.target.src_path
-                                } satisfies AnnotationProperties)
+                          {
+                              startColumn: primarySpan.column_start,
+                              endColumn: primarySpan.column_end,
+                              startLine: primarySpan.line_start,
+                              endLine: primarySpan.line_end,
+                              title: message.message,
+                              file: data.target.src_path
+                          } satisfies AnnotationProperties
                       ];
 
             method.apply(renderer, args);

diff --git a/src/main.ts b/src/main.ts
@@ -123,9 +123,9 @@ async function main() {
                                       : annotation.level === 'warning'
                                       ? ('warning' as const)
                                       : ('notice' as const),
-                              path: annotation.file!,
-                              start_line: annotation.startLine!,
-                              end_line: annotation.endLine!,
+                              path: annotation.file || './file/that/probably/doesnt/exist.rs',
+                              start_line: annotation.startLine || 0,
+                              end_line: annotation.endLine || 0,
                               start_column: annotation.startColumn,
                               end_column: annotation.endColumn,
                               raw_details: annotation.rendered,
@@ -149,9 +149,9 @@ async function main() {
                                       : annotation.level === 'warning'
                                       ? ('warning' as const)
                                       : ('notice' as const),
-                              path: annotation.file!,
-                              start_line: annotation.startLine!,
-                              end_line: annotation.endLine!,
+                              path: annotation.file || './file/that/probably/doesnt/exist.rs',
+                              start_line: annotation.startLine || 0,
+                              end_line: annotation.endLine || 0,
                               start_column: annotation.startColumn,
                               end_column: annotation.endColumn,
                               raw_details: annotation.rendered,