review

golangci · Jun 12, 2023 · 3a46c09 · 3a46c09
1 parent f1a5bd1
commit 3a46c09
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 40 deletions.
diff --git a/dist/post_run/index.js b/dist/post_run/index.js
@@ -66581,21 +66581,17 @@ function runLint(lintPath, patchPath) {
             .filter((arg) => arg.startsWith(`-`))
             .map((arg) => arg.replace(/^-+/, ``))
             .map((arg) => arg.split(/=(.*)/, 2))
-            .map(([key, value]) => [key, value !== null && value !== void 0 ? value : ""]);
+            .map(([key, value]) => [key.toLowerCase(), value !== null && value !== void 0 ? value : ""]);
         const userArgsMap = new Map(userArgsList);
-        const userArgNames = new Set(userArgsList.map(([key, value]) => key));
-        const formats = userArgsMap.get("out-format");
-        if (formats) {
-            if (formats.includes("github-actions")) {
-                addedArgs.push(`--out-format=${formats}`);
-            }
-            else {
-                addedArgs.push(`--out-format=github-actions,${formats}`);
-            }
-        }
-        else {
-            addedArgs.push(`--out-format=github-actions`);
-        }
+        const userArgNames = new Set(userArgsList.map(([key]) => key));
+        const formats = (userArgsMap.get("out-format") || "")
+            .trim()
+            .split(",")
+            .filter((f) => f.length > 0)
+            .filter((f) => !f.startsWith(`github-actions`))
+            .concat("github-actions")
+            .join(",");
+        addedArgs.push(`--out-format=${formats}`);
         if (patchPath) {
             if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
                 throw new Error(`please, don't specify manually --new* args when requesting only new issues`);

diff --git a/dist/run/index.js b/dist/run/index.js
@@ -66581,21 +66581,17 @@ function runLint(lintPath, patchPath) {
             .filter((arg) => arg.startsWith(`-`))
             .map((arg) => arg.replace(/^-+/, ``))
             .map((arg) => arg.split(/=(.*)/, 2))
-            .map(([key, value]) => [key, value !== null && value !== void 0 ? value : ""]);
+            .map(([key, value]) => [key.toLowerCase(), value !== null && value !== void 0 ? value : ""]);
         const userArgsMap = new Map(userArgsList);
-        const userArgNames = new Set(userArgsList.map(([key, value]) => key));
-        const formats = userArgsMap.get("out-format");
-        if (formats) {
-            if (formats.includes("github-actions")) {
-                addedArgs.push(`--out-format=${formats}`);
-            }
-            else {
-                addedArgs.push(`--out-format=github-actions,${formats}`);
-            }
-        }
-        else {
-            addedArgs.push(`--out-format=github-actions`);
-        }
+        const userArgNames = new Set(userArgsList.map(([key]) => key));
+        const formats = (userArgsMap.get("out-format") || "")
+            .trim()
+            .split(",")
+            .filter((f) => f.length > 0)
+            .filter((f) => !f.startsWith(`github-actions`))
+            .concat("github-actions")
+            .join(",");
+        addedArgs.push(`--out-format=${formats}`);
         if (patchPath) {
             if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
                 throw new Error(`please, don't specify manually --new* args when requesting only new issues`);

diff --git a/src/run.ts b/src/run.ts
@@ -125,21 +125,20 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
     .filter((arg) => arg.startsWith(`-`))
     .map((arg) => arg.replace(/^-+/, ``))
     .map((arg) => arg.split(/=(.*)/, 2))
-    .map<[string, string]>(([key, value]) => [key, value ?? ""])
+    .map<[string, string]>(([key, value]) => [key.toLowerCase(), value ?? ""])
 
   const userArgsMap = new Map<string, string>(userArgsList)
-  const userArgNames = new Set<string>(userArgsList.map(([key, value]) => key))
+  const userArgNames = new Set<string>(userArgsList.map(([key]) => key))
 
-  const formats = userArgsMap.get("out-format")
-  if (formats) {
-    if (formats.includes("github-actions")) {
-      addedArgs.push(`--out-format=${formats}`)
-    } else {
-      addedArgs.push(`--out-format=github-actions,${formats}`)
-    }
-  } else {
-    addedArgs.push(`--out-format=github-actions`)
-  }
+  const formats = (userArgsMap.get("out-format") || "")
+    .trim()
+    .split(",")
+    .filter((f) => f.length > 0)
+    .filter((f) => !f.startsWith(`github-actions`))
+    .concat("github-actions")
+    .join(",")
+
+  addedArgs.push(`--out-format=${formats}`)
 
   if (patchPath) {
     if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {