Skip to content

Commit 6cb1237

Browse files
committed
Merge branch 'master' into tsserverSourceFileVersioning
2 parents 57e397f + d662d94 commit 6cb1237

File tree

2,299 files changed

+312900
-34692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,299 files changed

+312900
-34692
lines changed

.github/issue_template.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/workflows/update-package-lock.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
# This is probably 6am UTC, which is 10pm PST or 11pm PDT
66
# Alternatively, 6am local is also fine
77
- cron: '0 6 * * *'
8+
workflow_dispatch: {}
89

910
jobs:
1011
build:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ with any additional questions or comments.
4343
## Documentation
4444

4545
* [TypeScript in 5 minutes](https://www.typescriptlang.org/docs/handbook/typescript-in-5-minutes.html)
46-
* [Programming handbook](https://www.typescriptlang.org/docs/handbook/basic-types.html)
46+
* [Programming handbook](https://www.typescriptlang.org/docs/handbook/intro.html)
4747
* [Homepage](https://www.typescriptlang.org/)
4848

4949
## Building

package-lock.json

Lines changed: 238 additions & 202 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "https://www.typescriptlang.org/",
5-
"version": "4.3.0",
5+
"version": "4.4.0",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [
@@ -53,9 +53,9 @@
5353
"@types/source-map-support": "latest",
5454
"@types/through2": "latest",
5555
"@types/xml2js": "^0.4.0",
56-
"@typescript-eslint/eslint-plugin": "4.5.0",
57-
"@typescript-eslint/experimental-utils": "4.5.0",
58-
"@typescript-eslint/parser": "4.5.0",
56+
"@typescript-eslint/eslint-plugin": "^4.19.0",
57+
"@typescript-eslint/experimental-utils": "^4.19.0",
58+
"@typescript-eslint/parser": "^4.19.0",
5959
"async": "latest",
6060
"azure-devops-node-api": "^10.1.0",
6161
"browser-resolve": "^1.11.2",
@@ -94,7 +94,7 @@
9494
"remove-internal": "^2.9.2",
9595
"source-map-support": "latest",
9696
"through2": "latest",
97-
"typescript": "^4.0.0-dev.20200624",
97+
"typescript": "^4.2.3",
9898
"vinyl": "latest",
9999
"vinyl-sourcemaps-apply": "latest",
100100
"xml2js": "^0.4.19"
@@ -129,6 +129,5 @@
129129
},
130130
"volta": {
131131
"node": "14.15.5"
132-
},
133-
"dependencies": {}
132+
}
134133
}

src/compiler/binder.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ namespace ts {
683683
}
684684
if (node.kind === SyntaxKind.SourceFile) {
685685
node.flags |= emitFlags;
686+
(node as SourceFile).endFlowNode = currentFlow;
686687
}
687688

688689
if (currentReturnTarget) {
@@ -2122,9 +2123,9 @@ namespace ts {
21222123
const saveParent = parent;
21232124
const saveCurrentFlow = currentFlow;
21242125
for (const typeAlias of delayedTypeAliases) {
2125-
const host = getJSDocHost(typeAlias);
2126-
container = (host && findAncestor(host.parent, n => !!(getContainerFlags(n) & ContainerFlags.IsContainer))) || file;
2127-
blockScopeContainer = (host && getEnclosingBlockScopeContainer(host)) || file;
2126+
const host = typeAlias.parent.parent;
2127+
container = findAncestor(host.parent, n => !!(getContainerFlags(n) & ContainerFlags.IsContainer)) || file;
2128+
blockScopeContainer = getEnclosingBlockScopeContainer(host) || file;
21282129
currentFlow = initFlowNode({ flags: FlowFlags.Start });
21292130
parent = typeAlias;
21302131
bind(typeAlias.typeExpression);
@@ -2767,8 +2768,8 @@ namespace ts {
27672768

27682769
function bindExportAssignment(node: ExportAssignment) {
27692770
if (!container.symbol || !container.symbol.exports) {
2770-
// Export assignment in some sort of block construct
2771-
bindAnonymousDeclaration(node, SymbolFlags.Alias, getDeclarationName(node)!);
2771+
// Incorrect export assignment in some sort of block construct
2772+
bindAnonymousDeclaration(node, SymbolFlags.Value, getDeclarationName(node)!);
27722773
}
27732774
else {
27742775
const flags = exportAssignmentIsAlias(node)
@@ -3187,7 +3188,7 @@ namespace ts {
31873188
undefined;
31883189
init = init && getRightMostAssignedExpression(init);
31893190
if (init) {
3190-
const isPrototypeAssignment = isPrototypeAccess(isVariableDeclaration(node) ? node.name : isBinaryExpression(node) ? node.left : node);
3191+
const isPrototypeAssignment = isPrototypeAccess(isVariableDeclaration(node!) ? node.name : isBinaryExpression(node!) ? node.left : node!);
31913192
return !!getExpandoInitializer(isBinaryExpression(init) && (init.operatorToken.kind === SyntaxKind.BarBarToken || init.operatorToken.kind === SyntaxKind.QuestionQuestionToken) ? init.right : init, isPrototypeAssignment);
31923193
}
31933194
return false;

0 commit comments

Comments
 (0)