microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-11 02:15:10 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(44021): reference jsx pragma when JsxFragment is used (#45894)

Browse Source
This commit is contained in:
Hiroshi Ogawa
2021-09-30 03:31:59 +09:00
committed by GitHub
parent 5d0d7ae85d
commit 061f02cd64
6 changed files with 426 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/compiler/checker.ts
View File

@@ -1036,17 +1036,9 @@ namespace ts {
}
}
else {
if (file.localJsxNamespace) {
return file.localJsxNamespace;
}
const jsxPragma = file.pragmas.get("jsx");
if (jsxPragma) {
const chosenPragma = isArray(jsxPragma) ? jsxPragma[0] : jsxPragma;
file.localJsxFactory = parseIsolatedEntityName(chosenPragma.arguments.factory, languageVersion);
visitNode(file.localJsxFactory, markAsSynthetic);
if (file.localJsxFactory) {
return file.localJsxNamespace = getFirstIdentifier(file.localJsxFactory).escapedText;
}
const localJsxNamespace = getLocalJsxNamespace(file);
if (localJsxNamespace) {
return file.localJsxNamespace = localJsxNamespace;
}
}
}
@@ -1068,11 +1060,26 @@ namespace ts {
_jsxFactoryEntity = factory.createQualifiedName(factory.createIdentifier(unescapeLeadingUnderscores(_jsxNamespace)), "createElement");
}
return _jsxNamespace;
}
function markAsSynthetic(node: Node): VisitResult<Node> {
setTextRangePosEnd(node, -1, -1);
return visitEachChild(node, markAsSynthetic, nullTransformationContext);
function getLocalJsxNamespace(file: SourceFile): __String | undefined {
if (file.localJsxNamespace) {
return file.localJsxNamespace;
}
const jsxPragma = file.pragmas.get("jsx");
if (jsxPragma) {
const chosenPragma = isArray(jsxPragma) ? jsxPragma[0] : jsxPragma;
file.localJsxFactory = parseIsolatedEntityName(chosenPragma.arguments.factory, languageVersion);
visitNode(file.localJsxFactory, markAsSynthetic);
if (file.localJsxFactory) {
return file.localJsxNamespace = getFirstIdentifier(file.localJsxFactory).escapedText;
}
}
}
function markAsSynthetic(node: Node): VisitResult<Node> {
setTextRangePosEnd(node, -1, -1);
return visitEachChild(node, markAsSynthetic, nullTransformationContext);
}
function getEmitResolver(sourceFile: SourceFile, cancellationToken: CancellationToken) {
@@ -27598,6 +27605,15 @@ namespace ts {
markAliasSymbolAsReferenced(jsxFactorySym);
}
}
// For JsxFragment, mark jsx pragma as referenced via resolveName
if (isJsxOpeningFragment(node)) {
const file = getSourceFileOfNode(node);
const localJsxNamespace = getLocalJsxNamespace(file);
if (localJsxNamespace) {
resolveName(jsxFactoryLocation, localJsxNamespace, SymbolFlags.Value, jsxFactoryRefErr, localJsxNamespace, /*isUse*/ true);
}
}
}
if (isNodeOpeningLikeElement) {