Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect emit when internal method is inside internal interface

Browse Source
This commit is contained in:
Sheetal Nandi
2019-02-22 13:03:46 -08:00
parent 23cd45bdef
commit a63d69de7a
2 changed files with 110 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/emitter.ts
+14 -8
View File
@@ -665,6 +665,7 @@ namespace ts {
const bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } as BundleFileInfo : undefined;
const recordInternalSection = printerOptions.recordInternalSection;
let sourceFileTextPos = 0;
let sourceFileTextKind: BundleFileTextLikeKind = BundleFileSectionKind.Text;
// Source Maps
let sourceMapsDisabled = true;
@@ -777,9 +778,9 @@ namespace ts {
}
}
function recordBundleFileTextSection(end: number) {
function recordBundleFileTextLikeSection(end: number) {
if (sourceFileTextPos < end) {
updateOrPushBundleFileTextLike(sourceFileTextPos, end, BundleFileSectionKind.Text);
updateOrPushBundleFileTextLike(sourceFileTextPos, end, sourceFileTextKind);
return true;
}
return false;
@@ -817,7 +818,7 @@ namespace ts {
}
if (bundleFileInfo && bundle.sourceFiles.length) {
const end = writer.getTextPos();
if (recordBundleFileTextSection(end)) {
if (recordBundleFileTextLikeSection(end)) {
// Store prologues
const prologues = getPrologueDirectivesFromBundledSourceFiles(bundle);
if (prologues) {
@@ -914,14 +915,19 @@ namespace ts {
function emit(node: Node | undefined) {
if (node === undefined) return;
const end = writer.getTextPos();
const pos = getTextPosWithWriteLine();
const isInternal = recordInternalSection && bundleFileInfo && currentSourceFile && (isDeclaration(node) || isVariableStatement(node)) && isInternalDeclaration(node, currentSourceFile);
const prevSourceFileTextKind = sourceFileTextKind;
if (isInternal) {
recordBundleFileTextLikeSection(writer.getTextPos());
sourceFileTextPos = getTextPosWithWriteLine();
sourceFileTextKind = BundleFileSectionKind.Internal;
}
const pipelinePhase = getPipelinePhase(PipelinePhase.Notification, node);
pipelinePhase(EmitHint.Unspecified, node);
if (recordInternalSection && bundleFileInfo && currentSourceFile && (isDeclaration(node) || isVariableStatement(node)) && isInternalDeclaration(node, currentSourceFile)) {
recordBundleFileTextSection(end);
updateOrPushBundleFileTextLike(pos, writer.getTextPos(), BundleFileSectionKind.Internal);
if (isInternal) {
recordBundleFileTextLikeSection(writer.getTextPos());
sourceFileTextPos = getTextPosWithWriteLine();
sourceFileTextKind = prevSourceFileTextKind;
}
}