diff --git a/src/language-css/index.js b/src/language-css/index.js index ce51557b3..f7245dc81 100644 --- a/src/language-css/index.js +++ b/src/language-css/index.js @@ -5,35 +5,31 @@ const options = require("./options"); const createLanguage = require("../utils/create-language"); const languages = [ - createLanguage(require("linguist-languages/data/CSS"), data => - Object.assign(data, { - since: "1.4.0", - parsers: ["css"], - vscodeLanguageIds: ["css"] - }) - ), - createLanguage(require("linguist-languages/data/PostCSS"), data => - Object.assign(data, { - since: "1.4.0", - parsers: ["css"], - vscodeLanguageIds: ["postcss"], - extensions: data.extensions.concat(".postcss") - }) - ), - createLanguage(require("linguist-languages/data/Less"), data => - Object.assign(data, { - since: "1.4.0", - parsers: ["less"], - vscodeLanguageIds: ["less"] - }) - ), - createLanguage(require("linguist-languages/data/SCSS"), data => - Object.assign(data, { - since: "1.4.0", - parsers: ["scss"], - vscodeLanguageIds: ["scss"] - }) - ) + createLanguage(require("linguist-languages/data/CSS"), data => ({ + ...data, + since: "1.4.0", + parsers: ["css"], + vscodeLanguageIds: ["css"] + })), + createLanguage(require("linguist-languages/data/PostCSS"), data => ({ + ...data, + since: "1.4.0", + parsers: ["css"], + vscodeLanguageIds: ["postcss"], + extensions: data.extensions.concat(".postcss") + })), + createLanguage(require("linguist-languages/data/Less"), data => ({ + ...data, + since: "1.4.0", + parsers: ["less"], + vscodeLanguageIds: ["less"] + })), + createLanguage(require("linguist-languages/data/SCSS"), data => ({ + ...data, + since: "1.4.0", + parsers: ["scss"], + vscodeLanguageIds: ["scss"] + })) ]; const printers = { diff --git a/src/language-graphql/index.js b/src/language-graphql/index.js index 971e822d0..249f593bb 100644 --- a/src/language-graphql/index.js +++ b/src/language-graphql/index.js @@ -5,13 +5,12 @@ const options = require("./options"); const createLanguage = require("../utils/create-language"); const languages = [ - createLanguage(require("linguist-languages/data/GraphQL"), data => - Object.assign(data, { - since: "1.5.0", - parsers: ["graphql"], - vscodeLanguageIds: ["graphql"] - }) - ) + createLanguage(require("linguist-languages/data/GraphQL"), data => ({ + ...data, + since: "1.5.0", + parsers: ["graphql"], + vscodeLanguageIds: ["graphql"] + })) ]; const printers = { diff --git a/src/language-handlebars/index.js b/src/language-handlebars/index.js index 9a5fa49b9..ae529a582 100644 --- a/src/language-handlebars/index.js +++ b/src/language-handlebars/index.js @@ -4,13 +4,12 @@ const printer = require("./printer-glimmer"); const createLanguage = require("../utils/create-language"); const languages = [ - createLanguage(require("linguist-languages/data/Handlebars"), data => - Object.assign(data, { - since: null, // unreleased - parsers: ["glimmer"], - vscodeLanguageIds: ["handlebars"] - }) - ) + createLanguage(require("linguist-languages/data/Handlebars"), data => ({ + ...data, + since: null, // unreleased + parsers: ["glimmer"], + vscodeLanguageIds: ["handlebars"] + })) ]; const printers = { diff --git a/src/language-html/index.js b/src/language-html/index.js index fc2e81b3c..afbc37aa8 100644 --- a/src/language-html/index.js +++ b/src/language-html/index.js @@ -5,43 +5,39 @@ const createLanguage = require("../utils/create-language"); const options = require("./options"); const languages = [ - createLanguage(require("linguist-languages/data/HTML"), data => - Object.assign(data, { - name: "Angular", - since: "1.15.0", - parsers: ["angular"], - vscodeLanguageIds: ["html"], - extensions: [".component.html"], - filenames: [] - }) - ), - createLanguage(require("linguist-languages/data/HTML"), data => - Object.assign(data, { - since: "1.15.0", - parsers: ["html"], - vscodeLanguageIds: ["html"], - extensions: data.extensions.concat([ - ".mjml" // MJML is considered XML in Linguist but it should be formatted as HTML - ]) - }) - ), - createLanguage(require("linguist-languages/data/HTML"), data => - Object.assign(data, { - name: "Lightning Web Components", - since: "1.17.0", - parsers: ["lwc"], - vscodeLanguageIds: ["html"], - extensions: [], - filenames: [] - }) - ), - createLanguage(require("linguist-languages/data/Vue"), data => - Object.assign(data, { - since: "1.10.0", - parsers: ["vue"], - vscodeLanguageIds: ["vue"] - }) - ) + createLanguage(require("linguist-languages/data/HTML"), data => ({ + ...data, + name: "Angular", + since: "1.15.0", + parsers: ["angular"], + vscodeLanguageIds: ["html"], + extensions: [".component.html"], + filenames: [] + })), + createLanguage(require("linguist-languages/data/HTML"), data => ({ + ...data, + since: "1.15.0", + parsers: ["html"], + vscodeLanguageIds: ["html"], + extensions: data.extensions.concat([ + ".mjml" // MJML is considered XML in Linguist but it should be formatted as HTML + ]) + })), + createLanguage(require("linguist-languages/data/HTML"), data => ({ + ...data, + name: "Lightning Web Components", + since: "1.17.0", + parsers: ["lwc"], + vscodeLanguageIds: ["html"], + extensions: [], + filenames: [] + })), + createLanguage(require("linguist-languages/data/Vue"), data => ({ + ...data, + since: "1.10.0", + parsers: ["vue"], + vscodeLanguageIds: ["vue"] + })) ]; const printers = { diff --git a/src/language-js/index.js b/src/language-js/index.js index 7c80fd7a7..db1aa0710 100644 --- a/src/language-js/index.js +++ b/src/language-js/index.js @@ -6,79 +6,73 @@ const options = require("./options"); const createLanguage = require("../utils/create-language"); const languages = [ - createLanguage(require("linguist-languages/data/JavaScript"), data => - Object.assign(data, { - since: "0.0.0", - parsers: ["babel", "flow"], - vscodeLanguageIds: ["javascript", "mongo"], - interpreters: data.interpreters.concat(["nodejs"]) - }) - ), - createLanguage(require("linguist-languages/data/JavaScript"), data => - Object.assign(data, { - name: "Flow", - since: "0.0.0", - parsers: ["babel", "flow"], - vscodeLanguageIds: ["javascript"], - aliases: [], - filenames: [], - extensions: [".js.flow"] - }) - ), - createLanguage(require("linguist-languages/data/JSX"), data => - Object.assign(data, { - since: "0.0.0", - parsers: ["babel", "flow"], - vscodeLanguageIds: ["javascriptreact"] - }) - ), - createLanguage(require("linguist-languages/data/TypeScript"), data => - Object.assign(data, { - since: "1.4.0", - parsers: ["typescript"], - vscodeLanguageIds: ["typescript"] - }) - ), - createLanguage(require("linguist-languages/data/TSX"), data => - Object.assign(data, { - since: "1.4.0", - parsers: ["typescript"], - vscodeLanguageIds: ["typescriptreact"] - }) - ), - createLanguage(require("linguist-languages/data/JSON"), data => - Object.assign(data, { - name: "JSON.stringify", - since: "1.13.0", - parsers: ["json-stringify"], - vscodeLanguageIds: ["json"], - extensions: [], // .json file defaults to json instead of json-stringify - filenames: ["package.json", "package-lock.json", "composer.json"] - }) - ), - createLanguage(require("linguist-languages/data/JSON"), data => - Object.assign(data, { - since: "1.5.0", - parsers: ["json"], - vscodeLanguageIds: ["json"], - filenames: data.filenames.concat([".prettierrc"]) - }) - ), - createLanguage(require("linguist-languages/data/JSON with Comments"), data => - Object.assign(data, { + createLanguage(require("linguist-languages/data/JavaScript"), data => ({ + ...data, + since: "0.0.0", + parsers: ["babel", "flow"], + vscodeLanguageIds: ["javascript", "mongo"], + interpreters: data.interpreters.concat(["nodejs"]) + })), + createLanguage(require("linguist-languages/data/JavaScript"), data => ({ + ...data, + name: "Flow", + since: "0.0.0", + parsers: ["babel", "flow"], + vscodeLanguageIds: ["javascript"], + aliases: [], + filenames: [], + extensions: [".js.flow"] + })), + createLanguage(require("linguist-languages/data/JSX"), data => ({ + ...data, + since: "0.0.0", + parsers: ["babel", "flow"], + vscodeLanguageIds: ["javascriptreact"] + })), + createLanguage(require("linguist-languages/data/TypeScript"), data => ({ + ...data, + since: "1.4.0", + parsers: ["typescript"], + vscodeLanguageIds: ["typescript"] + })), + createLanguage(require("linguist-languages/data/TSX"), data => ({ + ...data, + since: "1.4.0", + parsers: ["typescript"], + vscodeLanguageIds: ["typescriptreact"] + })), + createLanguage(require("linguist-languages/data/JSON"), data => ({ + ...data, + name: "JSON.stringify", + since: "1.13.0", + parsers: ["json-stringify"], + vscodeLanguageIds: ["json"], + extensions: [], // .json file defaults to json instead of json-stringify + filenames: ["package.json", "package-lock.json", "composer.json"] + })), + createLanguage(require("linguist-languages/data/JSON"), data => ({ + ...data, + since: "1.5.0", + parsers: ["json"], + vscodeLanguageIds: ["json"], + filenames: data.filenames.concat([".prettierrc"]) + })), + createLanguage( + require("linguist-languages/data/JSON with Comments"), + data => ({ + ...data, since: "1.5.0", parsers: ["json"], vscodeLanguageIds: ["jsonc"], filenames: data.filenames.concat([".eslintrc"]) }) ), - createLanguage(require("linguist-languages/data/JSON5"), data => - Object.assign(data, { - since: "1.13.0", - parsers: ["json5"], - vscodeLanguageIds: ["json5"] - }) - ) + createLanguage(require("linguist-languages/data/JSON5"), data => ({ + ...data, + since: "1.13.0", + parsers: ["json5"], + vscodeLanguageIds: ["json5"] + })) ]; const printers = { diff --git a/src/language-markdown/index.js b/src/language-markdown/index.js index 887a8fd61..337e34741 100644 --- a/src/language-markdown/index.js +++ b/src/language-markdown/index.js @@ -5,25 +5,23 @@ const options = require("./options"); const createLanguage = require("../utils/create-language"); const languages = [ - createLanguage(require("linguist-languages/data/Markdown"), data => - Object.assign(data, { - since: "1.8.0", - parsers: ["remark"], - vscodeLanguageIds: ["markdown"], - filenames: data.filenames.concat(["README"]), - extensions: data.extensions.filter(extension => extension !== ".mdx") - }) - ), - createLanguage(require("linguist-languages/data/Markdown"), data => - Object.assign(data, { - name: "MDX", - since: "1.15.0", - parsers: ["mdx"], - vscodeLanguageIds: ["mdx"], - filenames: [], - extensions: [".mdx"] - }) - ) + createLanguage(require("linguist-languages/data/Markdown"), data => ({ + ...data, + since: "1.8.0", + parsers: ["remark"], + vscodeLanguageIds: ["markdown"], + filenames: data.filenames.concat(["README"]), + extensions: data.extensions.filter(extension => extension !== ".mdx") + })), + createLanguage(require("linguist-languages/data/Markdown"), data => ({ + ...data, + name: "MDX", + since: "1.15.0", + parsers: ["mdx"], + vscodeLanguageIds: ["mdx"], + filenames: [], + extensions: [".mdx"] + })) ]; const printers = { diff --git a/src/language-yaml/index.js b/src/language-yaml/index.js index 7cacfad5b..a0a66be9a 100644 --- a/src/language-yaml/index.js +++ b/src/language-yaml/index.js @@ -5,13 +5,12 @@ const options = require("./options"); const createLanguage = require("../utils/create-language"); const languages = [ - createLanguage(require("linguist-languages/data/YAML"), data => - Object.assign(data, { - since: "1.14.0", - parsers: ["yaml"], - vscodeLanguageIds: ["yaml"] - }) - ) + createLanguage(require("linguist-languages/data/YAML"), data => ({ + ...data, + since: "1.14.0", + parsers: ["yaml"], + vscodeLanguageIds: ["yaml"] + })) ]; module.exports = {