Skip to content

Commit

Permalink
Merge branch 'main' into re1
Browse files Browse the repository at this point in the history
  • Loading branch information
@kdy1
kdy1 authored Sep 22, 2023
2 parents af5ad98 + cf8baeb commit c471484
Show file tree
Hide file tree
Showing 107 changed files with 1,435 additions and 130 deletions.
1 change: 1 addition & 0 deletions crates/stc_ts_type_checker/tests/conformance.pass.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2204,6 +2204,7 @@ salsa/constructorNameInObjectLiteralAccessor.ts
salsa/inferringClassMembersFromAssignments8.ts
salsa/mixedPropertyElementAccessAssignmentDeclaration.ts
salsa/propertyAssignmentUseParentType3.ts
salsa/sourceFileMergeWithFunction.ts
salsa/typeFromPropertyAssignment30.ts
salsa/typeFromPropertyAssignment38.ts
scanner/ecmascript3/scannerES3NumericLiteral1.ts
Expand Down
13 changes: 13 additions & 0 deletions ...stc_ts_type_checker/tests/conformance/ambient/ambientDeclarationsExternal.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2307": 2
},
"extra_error_lines": {
"TS2307": [
2,
6
]
}
}
4 changes: 2 additions & 2 deletions ...tc_ts_type_checker/tests/conformance/ambient/ambientDeclarationsExternal.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 2,
panic: 0,
}
14 changes: 14 additions & 0 deletions ...stc_ts_type_checker/tests/conformance/ambient/ambientDeclarationsPatterns.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2307": 3
},
"extra_error_lines": {
"TS2307": [
2,
5,
9
]
}
}
4 changes: 2 additions & 2 deletions ...tc_ts_type_checker/tests/conformance/ambient/ambientDeclarationsPatterns.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 3,
panic: 0,
}
12 changes: 12 additions & 0 deletions ...es/stc_ts_type_checker/tests/conformance/ambient/ambientShorthand_merging.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2305": 1
},
"extra_error_lines": {
"TS2305": [
3
]
}
}
4 changes: 2 additions & 2 deletions ...s/stc_ts_type_checker/tests/conformance/ambient/ambientShorthand_merging.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 1,
panic: 0,
}
12 changes: 12 additions & 0 deletions ...c_ts_type_checker/tests/conformance/externalModules/topLevelAmbientModule.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2307": 1
},
"extra_error_lines": {
"TS2307": [
2
]
}
}
4 changes: 2 additions & 2 deletions ..._ts_type_checker/tests/conformance/externalModules/topLevelAmbientModule.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 1,
panic: 0,
}
18 changes: 18 additions & 0 deletions ...hecker/tests/conformance/externalModules/topLevelModuleDeclarationAndFile.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"required_errors": {
"TS2339": 1
},
"required_error_lines": {
"TS2339": [
3
]
},
"extra_errors": {
"TS2307": 1
},
"extra_error_lines": {
"TS2307": [
2
]
}
}
4 changes: 2 additions & 2 deletions ...ecker/tests/conformance/externalModules/topLevelModuleDeclarationAndFile.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 1,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 1,
panic: 0,
}
24 changes: 24 additions & 0 deletions .../stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-1.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2349": 1,
"TS2339": 1,
"TS2307": 1,
"TS2503": 1
},
"extra_error_lines": {
"TS2349": [
3
],
"TS2339": [
4
],
"TS2307": [
1
],
"TS2503": [
6
]
}
}
4 changes: 2 additions & 2 deletions ...stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-1.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 4,
panic: 0,
}
22 changes: 22 additions & 0 deletions .../stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-2.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2304": 2,
"TS2503": 2,
"TS2307": 1
},
"extra_error_lines": {
"TS2304": [
3,
4
],
"TS2503": [
5,
6
],
"TS2307": [
1
]
}
}
4 changes: 2 additions & 2 deletions ...stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-2.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 5,
panic: 0,
}
24 changes: 24 additions & 0 deletions .../stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-3.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2349": 1,
"TS2339": 1,
"TS2307": 1,
"TS2503": 1
},
"extra_error_lines": {
"TS2349": [
3
],
"TS2339": [
4
],
"TS2307": [
1
],
"TS2503": [
6
]
}
}
4 changes: 2 additions & 2 deletions ...stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-3.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 4,
panic: 0,
}
22 changes: 22 additions & 0 deletions .../stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-4.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2304": 2,
"TS2503": 2,
"TS2307": 1
},
"extra_error_lines": {
"TS2304": [
3,
4
],
"TS2503": [
5,
6
],
"TS2307": [
1
]
}
}
4 changes: 2 additions & 2 deletions ...stc_ts_type_checker/tests/conformance/externalModules/umd-augmentation-4.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 5,
panic: 0,
}
16 changes: 16 additions & 0 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd1.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2304": 1,
"TS2503": 1
},
"extra_error_lines": {
"TS2304": [
2
],
"TS2503": [
3
]
}
}
4 changes: 2 additions & 2 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd1.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 2,
panic: 0,
}
12 changes: 12 additions & 0 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd6.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2304": 1
},
"extra_error_lines": {
"TS2304": [
2
]
}
}
4 changes: 2 additions & 2 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd6.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 1,
panic: 0,
}
12 changes: 12 additions & 0 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd7.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"required_errors": {},
"required_error_lines": {},
"extra_errors": {
"TS2304": 1
},
"extra_error_lines": {
"TS2304": [
2
]
}
}
4 changes: 2 additions & 2 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd7.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 0,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 1,
panic: 0,
}
23 changes: 23 additions & 0 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd8.error-diff.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"required_errors": {
"TS2686": 1
},
"required_error_lines": {
"TS2686": [
7
]
},
"extra_errors": {
"TS2304": 2,
"TS2503": 1
},
"extra_error_lines": {
"TS2304": [
4,
7
],
"TS2503": [
6
]
}
}
4 changes: 2 additions & 2 deletions crates/stc_ts_type_checker/tests/conformance/externalModules/umd8.stats.rust-debug
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stats {
required_error: 1,
matched_error: 0,
extra_error: 0,
panic: 1,
extra_error: 3,
panic: 0,
}
Loading

0 comments on commit c471484

Please sign in to comment.