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.

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

Fix parser inference #15927

Merged
merged 8 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ overrides:
- files: "bin/prettier.cjs"
options:
trailingComma: none
# TODO: Enable this after `jsonc` parser released
# - files: ".vscode/*.json"
# options:
# parser: jsonc
- files: ".vscode/*.json"
options:
parser: jsonc
4 changes: 2 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"esbenp.prettier-vscode",
"editorconfig.editorconfig",
"dbaeumer.vscode-eslint",
"streetsidesoftware.code-spell-checker"
]
"streetsidesoftware.code-spell-checker",
],
}
8 changes: 4 additions & 4 deletions .vscode/settings.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": ["source.fixAll.eslint"]
"editor.codeActionsOnSave": ["source.fixAll.eslint"],
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
"source.fixAll.eslint": "explicit",
},
"prettier.requireConfig": true,
"eslint.experimental.useFlatConfig": true,
"files.exclude": {
"dist*": true
}
"dist*": true,
},
}
12 changes: 12 additions & 0 deletions changelog_unreleased/api/15927.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#### Fix parser inference (#15927 by @fisker)

<!-- prettier-ignore -->
```console
// Prettier stable
prettier --file-info tsconfig.json
{ "ignored": false, "inferredParser": "json" }

// Prettier main
prettier --file-info tsconfig.json
{ "ignored": false, "inferredParser": "jsonc" }
```
19 changes: 11 additions & 8 deletions src/utils/infer-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ function getLanguageByFileName(languages, file) {

const basename = getFileBasename(file).toLowerCase();

return languages.find(
(language) =>
language.extensions?.some((extension) => basename.endsWith(extension)) ||
language.filenames?.some((name) => name.toLowerCase() === basename),
return (
languages.find(({ filenames }) =>
filenames?.some((name) => name.toLowerCase() === basename),
) ??
languages.find(({ extensions }) =>
extensions?.some((extension) => basename.endsWith(extension)),
)
);
}

function getLanguageByName(languages, languageName) {
function getLanguageByLanguageName(languages, languageName) {
if (!languageName) {
return;
}
Expand All @@ -45,8 +48,8 @@ function getLanguageByInterpreter(languages, file) {
return;
}

return languages.find((language) =>
language.interpreters?.includes(interpreter),
return languages.find(({ interpreters }) =>
interpreters?.includes(interpreter),
);
}

Expand All @@ -66,7 +69,7 @@ function inferParser(options, fileInfo) {
// interpreter in the shebang line, if any; but since this requires FS access,
// do it last.
const language =
getLanguageByName(languages, fileInfo.language) ??
getLanguageByLanguageName(languages, fileInfo.language) ??
getLanguageByFileName(languages, fileInfo.physicalFile) ??
getLanguageByFileName(languages, fileInfo.file) ??
getLanguageByInterpreter(languages, fileInfo.physicalFile);
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/__tests__/file-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@ test("API getFileInfo with filepath only", async () => {
ignored: false,
inferredParser: "markdown",
});
await expect(prettier.getFileInfo("tsconfig.json")).resolves.toEqual({
ignored: false,
inferredParser: "jsonc",
});
});

describe("API getFileInfo resolveConfig", () => {
Expand Down