Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update flow support info #4943

Merged
merged 2 commits into from Aug 8, 2018
Merged

fix: update flow support info #4943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fce4743
fix: update flow support info
ikatyang Aug 7, 2018
1c5661b
docs: linguist/vscode prop is possible to be undefined
ikatyang Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/api.md
View file
Open in desktop
Expand Up @@ -104,15 +104,15 @@ The support information looks like this:
since?: string,
parsers: string[],
group?: string,
tmScope: string,
aceMode: string,
codemirrorMode: string,
codemirrorMimeType: string,
tmScope?: string,
aceMode?: string,
codemirrorMode?: string,
codemirrorMimeType?: string,
aliases?: string[],
extensions: string[],
extensions?: string[],
filenames?: string[],
linguistLanguageId: number,
vscodeLanguageIds: string[],
linguistLanguageId?: number,
vscodeLanguageIds?: string[],
}>
}
```
Expand Down
20 changes: 14 additions & 6 deletions src/language-js/index.js
View file
Open in desktop
Expand Up @@ -11,12 +11,20 @@ const languages = [
parsers: ["babylon", "flow"],
vscodeLanguageIds: ["javascript"]
}),
{
name: "Flow",
since: "0.0.0",
parsers: ["babylon", "flow"],
extensions: [".js.flow"]
},
Object.assign(
languageExtend({}, require("linguist-languages/data/javascript"), {
name: "Flow",
since: "0.0.0",
parsers: ["babylon", "flow"],
vscodeLanguageIds: ["javascript"]
}),
// overwrite
{
aliases: [],
filenames: [],
extensions: [".js.flow"]
}
),
languageExtend({}, require("linguist-languages/data/jsx"), {
since: "0.0.0",
parsers: ["babylon", "flow"],
Expand Down
13 changes: 12 additions & 1 deletion tests_integration/__tests__/__snapshots__/support-info.js.snap
View file
Open in desktop
Expand Up @@ -551,10 +551,21 @@ exports[`CLI --support-info (stdout) 1`] = `
\\"vscodeLanguageIds\\": [\\"javascript\\"]
},
{
\\"aceMode\\": \\"javascript\\",
\\"aliases\\": [],
\\"codemirrorMimeType\\": \\"text/javascript\\",
\\"codemirrorMode\\": \\"javascript\\",
\\"color\\": \\"#f1e05a\\",
\\"extensions\\": [\\".js.flow\\"],
\\"filenames\\": [],
\\"interpreters\\": [\\"node\\"],
\\"linguistLanguageId\\": 183,
\\"name\\": \\"Flow\\",
\\"parsers\\": [\\"babylon\\", \\"flow\\"],
\\"since\\": \\"0.0.0\\"
\\"since\\": \\"0.0.0\\",
\\"tmScope\\": \\"source.js\\",
\\"type\\": \\"programming\\",
\\"vscodeLanguageIds\\": [\\"javascript\\"]
},
{
\\"aceMode\\": \\"javascript\\",
Expand Down