Skip to content

Commit

Permalink
Update linguist-language (#12994)
Browse files Browse the repository at this point in the history
* Install new `linguist-language`

* Remove `.mts` and `.cts`

* Update tests
  • Loading branch information
sosukesuzuki committed Jun 11, 2022
1 parent e5868ad commit 2316e2f
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -62,7 +62,7 @@
"json5": "2.2.1",
"leven": "4.0.0",
"lines-and-columns": "2.0.3",
"linguist-languages": "7.15.0",
"linguist-languages": "7.21.0",
"mem": "9.0.2",
"meriyah": "4.2.1",
"micromatch": "4.0.5",
Expand Down
14 changes: 5 additions & 9 deletions src/language-js/index.js
Expand Up @@ -68,15 +68,11 @@ const languages = [
codemirrorMimeType: "text/jsx",
color: undefined,
})),
createLanguage(
require("linguist-languages/data/TypeScript.json"),
(data) => ({
since: "1.4.0",
parsers: ["typescript", "babel-ts"],
vscodeLanguageIds: ["typescript"],
extensions: [...data.extensions, ".mts", ".cts"],
})
),
createLanguage(require("linguist-languages/data/TypeScript.json"), () => ({
since: "1.4.0",
parsers: ["typescript", "babel-ts"],
vscodeLanguageIds: ["typescript"],
})),
createLanguage(require("linguist-languages/data/TSX.json"), () => ({
since: "1.4.0",
parsers: ["typescript", "babel-ts"],
Expand Down
26 changes: 24 additions & 2 deletions tests/integration/__tests__/__snapshots__/support-info.js.snap
Expand Up @@ -300,10 +300,13 @@ exports[`CLI --support-info (stdout) 1`] = `
".frag",
".gs",
".jake",
".javascript",
".jsb",
".jscad",
".jsfl",
".jslib",
".jsm",
".jspre",
".jss",
".mjs",
".njs",
Expand Down Expand Up @@ -400,8 +403,8 @@ exports[`CLI --support-info (stdout) 1`] = `
"aliases": ["ts"],
"codemirrorMimeType": "application/typescript",
"codemirrorMode": "javascript",
"color": "#2b7489",
"extensions": [".ts", ".mts", ".cts"],
"color": "#3178c6",
"extensions": [".ts", ".cts", ".mts"],
"interpreters": ["deno", "ts-node"],
"linguistLanguageId": 378,
"name": "TypeScript",
Expand All @@ -415,6 +418,7 @@ exports[`CLI --support-info (stdout) 1`] = `
"aceMode": "javascript",
"codemirrorMimeType": "text/jsx",
"codemirrorMode": "jsx",
"color": "#3178c6",
"extensions": [".tsx"],
"group": "TypeScript",
"linguistLanguageId": 94901924,
Expand All @@ -427,8 +431,10 @@ exports[`CLI --support-info (stdout) 1`] = `
},
{
"aceMode": "json",
"aliases": ["geojson", "jsonl", "topojson"],
"codemirrorMimeType": "application/json",
"codemirrorMode": "javascript",
"color": "#292929",
"extensions": [".importmap"],
"filenames": ["package.json", "package-lock.json", "composer.json"],
"linguistLanguageId": 174,
Expand All @@ -441,10 +447,14 @@ exports[`CLI --support-info (stdout) 1`] = `
},
{
"aceMode": "json",
"aliases": ["geojson", "jsonl", "topojson"],
"codemirrorMimeType": "application/json",
"codemirrorMode": "javascript",
"color": "#292929",
"extensions": [
".json",
".4DForm",
".4DProject",
".avsc",
".geojson",
".gltf",
Expand All @@ -462,8 +472,11 @@ exports[`CLI --support-info (stdout) 1`] = `
],
"filenames": [
".arcconfig",
".auto-changelog",
".c8rc",
".htmlhintrc",
".imgbotconfig",
".nycrc",
".tern-config",
".tern-project",
".watchmanconfig",
Expand All @@ -484,8 +497,10 @@ exports[`CLI --support-info (stdout) 1`] = `
"aliases": ["jsonc"],
"codemirrorMimeType": "text/javascript",
"codemirrorMode": "javascript",
"color": "#292929",
"extensions": [
".jsonc",
".code-snippets",
".sublime-build",
".sublime-commands",
".sublime-completions",
Expand All @@ -502,6 +517,7 @@ exports[`CLI --support-info (stdout) 1`] = `
],
"filenames": [
".babelrc",
".devcontainer.json",
".eslintrc.json",
".jscsrc",
".jshintrc",
Expand All @@ -528,6 +544,7 @@ exports[`CLI --support-info (stdout) 1`] = `
"aceMode": "javascript",
"codemirrorMimeType": "application/json",
"codemirrorMode": "javascript",
"color": "#267CB9",
"extensions": [".json5"],
"linguistLanguageId": 175,
"name": "JSON5",
Expand All @@ -553,6 +570,7 @@ exports[`CLI --support-info (stdout) 1`] = `
},
{
"aceMode": "text",
"color": "#dc3a0c",
"extensions": [".pcss", ".postcss"],
"group": "CSS",
"linguistLanguageId": 262764437,
Expand All @@ -565,6 +583,7 @@ exports[`CLI --support-info (stdout) 1`] = `
},
{
"aceMode": "less",
"aliases": ["less-css"],
"codemirrorMimeType": "text/css",
"codemirrorMode": "css",
"color": "#1d365d",
Expand Down Expand Up @@ -624,6 +643,7 @@ exports[`CLI --support-info (stdout) 1`] = `
"color": "#083fa1",
"extensions": [
".md",
".livemd",
".markdown",
".mdown",
".mdwn",
Expand Down Expand Up @@ -685,6 +705,7 @@ exports[`CLI --support-info (stdout) 1`] = `
"color": "#e34c26",
"extensions": [
".html",
".hta",
".htm",
".html.hl",
".inc",
Expand Down Expand Up @@ -750,6 +771,7 @@ exports[`CLI --support-info (stdout) 1`] = `
".clang-format",
".clang-tidy",
".gemrc",
"CITATION.cff",
"glide.lock",
".prettierrc",
".stylelintrc"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -4782,10 +4782,10 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==

linguist-languages@7.15.0:
version "7.15.0"
resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.15.0.tgz#a93bed6b93015d8133622cb05da6296890862bfa"
integrity sha512-qkSSNDjDDycZ2Wcw+GziNBB3nNo3ddYUInM/PL8Amgwbd9RQ/BKGj2/1d6mdxKgBFnUqZuaDbkIwkE4KUwwmtQ==
linguist-languages@7.21.0:
version "7.21.0"
resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.21.0.tgz#da0184f622367cb092f1f8ba435937a85534f675"
integrity sha512-KrWJJbFOvlDhjlt5OhUipVlXg+plUfRurICAyij1ZVxQcqPt/zeReb9KiUVdGUwwhS/2KS9h3TbyfYLA5MDlxQ==

load-json-file@^4.0.0:
version "4.0.0"
Expand Down

0 comments on commit 2316e2f

Please sign in to comment.