From 41d079cb4ab2466a07853dc78eefbbe4de373a2d Mon Sep 17 00:00:00 2001
From: Takayuki Nakata <f.seasons017@gmail.com>
Date: Thu, 1 Dec 2022 16:59:53 +0900
Subject: [PATCH] Catch error level from Clippy

---
 dist/index.js     | Bin 239315 -> 239692 bytes
 dist/index.js.map | Bin 278227 -> 278670 bytes
 src/main.ts       |  20 ++++++++++++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 0a94336fe35eb5b38ec6b555d691fa75fa335313..056e5e54902c7ed36efb1ce76a2606ebaed78aca 100644
GIT binary patch
delta 262
zcmcb7mha33z6~$rCx2EGV@uA-EGVd)?5Hlurkk9flV1d6O0edomZgGNl8l8Ql3zDB
zwYWGjJyka?zbH4c1f+%~t2jRo$Pk}gqrnL?rcc9bbAf^?iyc(G573+(1zUyW{JfIX
zyb?XAuwD*C+}2h>y*#lfFEcM)UBMp6R#&i6P)}9gT&R-7$b)Rg=JTrdjFL75MX7c+
z$@wX%cB-zbX;!K^R;tNXswGyF6Vw$Z^Q&_+L7A57n!GmpV1+jNAWhAV>g|r|j6lq^
K-BF!+Qau2a)m9b&

delta 144
zcmX?ef$#EJz6~$rmDQ7TG7AbS)pZoqb#;^TbMlKo%)HdHR4_xgP+ezofr5yFf_heQ
zejZRxPfxEPv8Xsz1ESF_Co#QPGgfDEVw1#V3oXgbe2S_po2RPUF>ZdWX3fZ}>Z+P%
lrJ7@<nrx+-JJ~@&a&o<fUh{2@_S+haK+LrLwgz)yJphRmFK++<

diff --git a/dist/index.js.map b/dist/index.js.map
index 59c748475b10f8826733f8b12c627a7900f6ef30..cef6ec626090544c2b5fa7cf93901eb66af72b26 100644
GIT binary patch
delta 346
zcmccoSD>#^aKm1`=|M3};%vz|nFR%v(*-M-L?(aGXW>xS)lJUN$uEM7u&L*zmZc*2
z%<8&@aLLIJ^@OJjS1<{I^s=gF73b$6<m$~ip~g?1Xzn|mOOjD=bA-Mo3r}upadBdL
zst?fIoXL*H!tyyFmV&LVt%7=aVo_dZUb?!1J&>)gV5Oj*sy=z6k^J-p8yVR)HyXPz
zqG;cI(8Qfl+NPi=)y^h4KPA;p)m1gkN;StyHQ7qF#7Z?6;T&Bv_Q{-P+$`v#hP*cV
zV68U#AY)K8G)J4YN1HJMG1K;FGiKiI=?eRp&8M&DW#M48c62WD+CGts<pSe&*Tc+x
F)c^p%Zz})*

delta 161
zcmeBc6ukUbV8dQLd-dd;%z}bSbsYtDUESpToctmXGcUC)70l2rgvjKk78fU`r|PEV
z7v(0FfW)$j^YheoCQr~8V~W+8zEG1<a<Ye|)bu_nM#0Vh^fg&FcbT{_ZoX&g%s4s9
zoM-YwbA`#B=332<%-bKCGXgQw_DAN-T;0<b@Ud{PT01(MdTuv-#C(}?JM&TI?rH!c
Ci8liP

diff --git a/src/main.ts b/src/main.ts
index 393847d..4ffa283 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,7 +13,7 @@ async function run(): Promise<void> {
   try {
     const reviewdogVersion = core.getInput('reviewdog_version') || 'latest'
     const toolName = core.getInput('tool_name') || 'clippy'
-    const clippyFlags = core.getInput('clippy_flags');
+    const clippyFlags = core.getInput('clippy_flags')
     const level = core.getInput('level') || 'error'
     const reporter = core.getInput('reporter') || 'github-pr-check'
     const filterMode = core.getInput('filter_mode') || 'added'
@@ -38,7 +38,15 @@ async function run(): Promise<void> {
         const output: string[] = []
         await exec.exec(
           'cargo',
-          ['clippy', '--color', 'never', '-q', '--message-format', 'json', ...parse(clippyFlags)],
+          [
+            'clippy',
+            '--color',
+            'never',
+            '-q',
+            '--message-format',
+            'json',
+            ...parse(clippyFlags)
+          ],
           {
             cwd,
             ignoreReturnCode: true,
@@ -64,11 +72,13 @@ async function run(): Promise<void> {
 
                 core.debug('this is a compiler-message!')
                 const span = content.message.spans[0]
+                const messageLevel =
+                  content.message.level === 'warning' ? 'w' : 'e'
                 const rendered =
                   reporter === 'github-pr-review'
                     ? ` \n<pre><code>${content.message.rendered}</code></pre>\n__END__`
                     : `${content.message.rendered}\n__END__`
-                const ret = `${span.file_name}:${span.line_start}:${span.column_start}:${rendered}`
+                const ret = `${span.file_name}:${span.line_start}:${span.column_start}:${messageLevel}:${rendered}`
                 output.push(ret)
               }
             }
@@ -80,8 +90,10 @@ async function run(): Promise<void> {
         return await exec.exec(
           reviewdog,
           [
-            '-efm=%E%f:%l:%c:%m',
+            '-efm=<pre><code>%E%f:%l:%c:%t:%m',
+            '-efm=%E%f:%l:%c:%t:%m',
             '-efm=%Z__END__',
+            '-efm=%C%m</code></pre>',
             '-efm=%C%m',
             '-efm=%C',
             `-name=${toolName}`,