foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-03 04:48:52 -05:00
Code Issues Packages 1 Wiki Activity

fix: [prettier] deno fmt should format jsx/tsx files (#3118)

Browse source
This commit is contained in:
Yusuke Sakurai 2019-10-13 04:55:05 +09:00 committed by Ryan Dahl
parent 4b7204babe
commit 5f5583cf19
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
std/prettier/main.ts
View file

@ -191,9 +191,9 @@ async function formatFile(
* Selects the right prettier parser for the given path. * Selects the right prettier parser for the given path.
*/ */
function selectParser(path: string): ParserLabel | null { function selectParser(path: string): ParserLabel | null {
if (/\.ts$/.test(path)) { if (/\.tsx?$/.test(path)) {
return "typescript"; return "typescript";
} else if (/\.js$/.test(path)) { } else if (/\.jsx?$/.test(path)) {
return "babel"; return "babel";
} else if (/\.json$/.test(path)) { } else if (/\.json$/.test(path)) {
return "json"; return "json";

12
std/prettier/main_test.ts
View file

@ -26,8 +26,9 @@ const cmd = [
"--allow-run", "--allow-run",
"--allow-write", "--allow-write",
"--allow-read", "--allow-read",
"prettier/main.ts" "./prettier/main.ts"
]; ];
const testdata = join("prettier", "testdata"); const testdata = join("prettier", "testdata");
function normalizeOutput(output: string): string { function normalizeOutput(output: string): string {
@ -51,7 +52,9 @@ test(async function testPrettierCheckAndFormatFiles(): Promise<void> {
const files = [ const files = [
join(tempDir, "0.ts"), join(tempDir, "0.ts"),
join(tempDir, "1.js"), join(tempDir, "1.js"),
join(tempDir, "2.ts") join(tempDir, "2.ts"),
join(tempDir, "3.jsx"),
join(tempDir, "4.tsx")
]; ];
let p = await run([...cmd, "--check", ...files]); let p = await run([...cmd, "--check", ...files]);
@ -63,7 +66,10 @@ test(async function testPrettierCheckAndFormatFiles(): Promise<void> {
assertEquals( assertEquals(
normalizeOutput(p.stdout), normalizeOutput(p.stdout),
normalizeOutput(`Formatting ${tempDir}/0.ts normalizeOutput(`Formatting ${tempDir}/0.ts
Formatting ${tempDir}/1.js`) Formatting ${tempDir}/1.js
Formatting ${tempDir}/3.jsx
Formatting ${tempDir}/4.tsx
`)
); );
p = await run([...cmd, "--check", ...files]); p = await run([...cmd, "--check", ...files]);

2
std/prettier/testdata/3.jsx vendored Normal file
View file

@ -0,0 +1,2 @@
<div>
</div>

3
std/prettier/testdata/4.tsx vendored Normal file
View file

@ -0,0 +1,3 @@
<div>
</div>