Skip to content

Merge 'decorators' into 'modifiers' on various nodes #49089

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jun 10, 2022
Merged

Merge 'decorators' into 'modifiers' on various nodes #49089

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a4b5d9
Merge 'decorators' into 'modifiers' on various Nodes
rbuckton May 12, 2022
1cf55ef
Drop RESERVED argument in favor of removing parameter
rbuckton May 14, 2022
22c59ec
Merge branch 'main' into mergeDecoratorsAndModifiers
rbuckton May 18, 2022
f3f2823
Ignore grammar error nodes when asserting invariants
rbuckton May 18, 2022
4d3805f
Revert 'illegalX' property renames
rbuckton May 21, 2022
67dec37
Merge branch 'main' into mergeDecoratorsAndModifiers
rbuckton Jun 3, 2022
d6e4576
PR Feedback
rbuckton Jun 4, 2022
03aed39
Merge branch 'main' into mergeDecoratorsAndModifiers
rbuckton Jun 9, 2022
82f4e7c
Add loggers for 'typescript' and 'tsserver' modules to ensure depreca…
rbuckton Jun 9, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into mergeDecoratorsAndModifiers 
# Conflicts:
#	src/testRunner/unittests/tsbuild/helpers.ts
  • Loading branch information
@rbuckton
rbuckton committed Jun 9, 2022
commit 03aed39045b9963b71a559142a276fbcf44ace28
54 changes: 23 additions & 31 deletions src/testRunner/unittests/tsbuild/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,36 +407,28 @@ interface Symbol {
},
`FileInfos:: File:: ${outputFile}`
);
// Verify exportedModulesMap
verifyMapLike(
incrementalReadableBuildInfo?.program?.exportedModulesMap,
cleanReadableBuildInfo?.program?.exportedModulesMap,
(key, incrementalReferenceSet, cleanReferenceSet) => {
if (!arrayIsEqualTo(incrementalReferenceSet, cleanReferenceSet) && !arrayIsEqualTo(incrementalReferenceSet, incrementalReadableBuildInfo!.program!.referencedMap![key])) {
return [
`Incremental Reference set is neither from dts nor files reference map for File:: ${key}::`,
`Incremental:: ${JSON.stringify(incrementalReferenceSet, /*replacer*/ undefined, 2)}`,
`Clean:: ${JSON.stringify(cleanReferenceSet, /*replacer*/ undefined, 2)}`,
`IncrementalReferenceMap:: ${JSON.stringify(incrementalReadableBuildInfo!.program!.referencedMap![key], /*replacer*/ undefined, 2)}`,
`CleanReferenceMap:: ${JSON.stringify(cleanReadableBuildInfo!.program!.referencedMap![key], /*replacer*/ undefined, 2)}`,
];
}
},
`exportedModulesMap:: File:: ${outputFile}`
);
// Verify that incrementally pending affected file emit are in clean build since clean build can contain more files compared to incremental depending of noEmitOnError option
if (incrementalReadableBuildInfo?.program?.affectedFilesPendingEmit) {
if (cleanReadableBuildInfo?.program?.affectedFilesPendingEmit === undefined) {
addBaseline(
`Incremental build contains affectedFilesPendingEmit, clean build does not have it: ${outputFile}::`,
`Incremental buildInfoText:: ${incrementalBuildText}`,
`Clean buildInfoText:: ${cleanBuildText}`
);
}
let expectedIndex = 0;
incrementalReadableBuildInfo.program.affectedFilesPendingEmit.forEach(([actualFile]) => {
expectedIndex = findIndex(cleanReadableBuildInfo!.program!.affectedFilesPendingEmit, ([expectedFile]) => actualFile === expectedFile, expectedIndex);
if (expectedIndex === -1) {
if (!isReadableProgramBundleEmitBuildInfo(incrementalReadableBuildInfo?.program)) {
Debug.assert(!isReadableProgramBundleEmitBuildInfo(cleanReadableBuildInfo?.program));
// Verify exportedModulesMap
verifyMapLike(
incrementalReadableBuildInfo?.program?.exportedModulesMap,
cleanReadableBuildInfo?.program?.exportedModulesMap,
(key, incrementalReferenceSet, cleanReferenceSet) => {
if (!arrayIsEqualTo(incrementalReferenceSet, cleanReferenceSet) && !arrayIsEqualTo(incrementalReferenceSet, (incrementalReadableBuildInfo!.program! as ReadableProgramMultiFileEmitBuildInfo).referencedMap![key])) {
return [
`Incremental Reference set is neither from dts nor files reference map for File:: ${key}::`,
`Incremental:: ${JSON.stringify(incrementalReferenceSet, /*replacer*/ undefined, 2)}`,
`Clean:: ${JSON.stringify(cleanReferenceSet, /*replacer*/ undefined, 2)}`,
`IncrementalReferenceMap:: ${JSON.stringify((incrementalReadableBuildInfo!.program! as ReadableProgramMultiFileEmitBuildInfo).referencedMap![key], /*replacer*/ undefined, 2)}`,
`CleanReferenceMap:: ${JSON.stringify((cleanReadableBuildInfo!.program! as ReadableProgramMultiFileEmitBuildInfo).referencedMap![key], /*replacer*/ undefined, 2)}`,
];
}
},
`exportedModulesMap:: File:: ${outputFile}`
);
// Verify that incrementally pending affected file emit are in clean build since clean build can contain more files compared to incremental depending of noEmitOnError option
if (incrementalReadableBuildInfo?.program?.affectedFilesPendingEmit) {
if (cleanReadableBuildInfo?.program?.affectedFilesPendingEmit === undefined) {
addBaseline(
`Incremental build contains affectedFilesPendingEmit, clean build does not have it: ${outputFile}::`,
`Incremental buildInfoText:: ${incrementalBuildText}`,
Expand All @@ -445,7 +437,7 @@ interface Symbol {
}
let expectedIndex = 0;
incrementalReadableBuildInfo.program.affectedFilesPendingEmit.forEach(([actualFile]) => {
expectedIndex = findIndex((cleanReadableBuildInfo!.program! as ReadableProgramMultiFileEmitBuildInfo).affectedFilesPendingEmit!, ([expectedFile]) => actualFile === expectedFile, expectedIndex);
expectedIndex = findIndex((cleanReadableBuildInfo!.program! as ReadableProgramMultiFileEmitBuildInfo).affectedFilesPendingEmit, ([expectedFile]) => actualFile === expectedFile, expectedIndex);
if (expectedIndex === -1) {
addBaseline(
`Incremental build contains ${actualFile} file as pending emit, clean build does not have it: ${outputFile}::`,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.