vitalif-js
/
prettier
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(typescript): support TaggedTemplateExpression typeParameters (#4353) 

* test: add tests

* feat(typescript): support TaggedTemplateExpression typeParameters

* fix(playground): `buffer is not defined` in `--parser typescript`

* chore(deps): update typescript-eslint-parser
master
Ika 2018-04-24 21:45:06 +08:00 committed by Brian Ng
parent 50101e98c6
commit 643e2a83d6
6 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -55,8 +55,8 @@
"resolve": "1.5.0",
"semver": "5.4.1",
"string-width": "2.1.1",
"typescript": "2.8.0-rc",
"typescript-eslint-parser": "14.0.0",
"typescript": "2.9.0-dev.20180421",
"typescript-eslint-parser": "eslint/typescript-eslint-parser#2960b002746c01fb9cb15bb5f4c1e7e925c6519a",
"unicode-regex": "1.0.1",
"unified": "6.1.6"
},

8
src/language-js/printer-estree.js
View File

@ -2095,7 +2095,11 @@ function printPathNoParens(path, options, print, args) {
// These types are unprintable because they serve as abstract
// supertypes for other (printable) types.
case "TaggedTemplateExpression":
return concat([path.call(print, "tag"), path.call(print, "quasi")]);
return concat([
path.call(print, "tag"),
path.call(print, "typeParameters"),
path.call(print, "quasi")
]);
case "Node":
case "Printable":
case "SourceLocation":
@ -2723,7 +2727,7 @@ function printPathNoParens(path, options, print, args) {
return concat([path.call(print, "expression"), "!"]);
case "TSThisType":
return "this";
case "TSLastTypeNode":
case "TSLiteralType":
return path.call(print, "literal");
case "TSIndexedAccessType":
return concat([

13
tests/typescript_typeparams/__snapshots__/jsfmt.spec.js.snap
View File

@ -34,3 +34,16 @@ export const forwardS = R.curry(
);
`;
exports[`tagged-template-expression.ts 1`] = `
export const RedBox = styled.div<{foo: string}>\`
background: red;
\${props => props.foo}
\`;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export const RedBox = styled.div<{ foo: string }>\`
background: red;
\${props => props.foo};
\`;
`;

4
tests/typescript_typeparams/tagged-template-expression.ts Normal file
View File

@ -0,0 +1,4 @@
export const RedBox = styled.div<{foo: string}>`
background: red;
${props => props.foo}
`;

2
website/static/worker.js
View File

@ -20,7 +20,7 @@ self.Buffer = {
}
};
self.constants = {};
module$1 = module = os = crypto = {};
module$1 = module = os = crypto = buffer = {};
self.fs = { readFile: function() {} };
os.homedir = function() {
return "/home/prettier";

10
yarn.lock
View File

@ -4762,16 +4762,16 @@ typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
typescript-eslint-parser@14.0.0:
typescript-eslint-parser@eslint/typescript-eslint-parser#2960b002746c01fb9cb15bb5f4c1e7e925c6519a:
version "14.0.0"
resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-14.0.0.tgz#c90a8f541c1d96e5c55e2807c61d154e788520f9"
resolved "https://codeload.github.com/eslint/typescript-eslint-parser/tar.gz/2960b002746c01fb9cb15bb5f4c1e7e925c6519a"
dependencies:
lodash.unescape "4.0.1"
semver "5.5.0"
typescript@2.8.0-rc:
version "2.8.0-rc"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.0-rc.tgz#a0256b7d1d39fb7493ba0403f55e95d31e8bc374"
typescript@2.9.0-dev.20180421:
version "2.9.0-dev.20180421"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-dev.20180421.tgz#b937b164ce73f833f2ed5c36571e238898b264ce"
ua-parser-js@^0.7.9:
version "0.7.17"