Fix after rebase

prettier · Mar 29, 2023 · be70daa · be70daa
1 parent 0cacfbd
commit be70daa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/src/cli/cli-options.evaluate.js b/src/cli/cli-options.evaluate.js
@@ -193,9 +193,13 @@ const options = {
     type: "flag",
   },
   ignorePath: {
+    array: true,
     category: optionCategories.CATEGORY_CONFIG,
-    default: ".prettierignore",
-    description: "Path to a file with patterns describing files to ignore.",
+    default: [{ value: [".prettierignore"] }],
+    description: outdent`
+      Path to a file with patterns describing files to ignore.
+      Multiple values are accepted.
+    `,
     type: "path",
   },
   ignoreUnknown: {

diff --git a/src/cli/options/create-minimist-options.js b/src/cli/options/create-minimist-options.js
@@ -18,21 +18,7 @@ export default function createMinimistOptions(detailedOptions) {
         name === "plugin-search-dir") &&
       option.default !== undefined
     ) {
-      let defaultValue = option.default;
-      /*
-      FIXME:
-      This part is not right for "plugin-search-dir" we got `[]`,
-      but for "ignore-path" we got `[{value: []}]`.
-      Probably because "plugin-search-dir" is an api option
-      */
-      if (
-        Array.isArray(defaultValue) &&
-        defaultValue.length === 1 &&
-        defaultValue[0].value
-      ) {
-        defaultValue = defaultValue[0].value;
-      }
-      defaultValues[option.name] = defaultValue;
+      defaultValues[option.name] = option.default;
     }
   }