8000 PR Feedback · prmdeveloper/TypeScript@a0dbe76 · GitHub
[go: up one dir, main page]

Skip to content

Commit a0dbe76

Browse files
committed
PR Feedback
1 parent fe7ad5f commit a0dbe76

File tree

6 files changed

+269
-212
lines changed

6 files changed

+269
-212
lines changed

src/compiler/checker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4846,7 +4846,7 @@ namespace ts {
48464846
const parent = container && container.parent;
48474847
if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) {
48484848
if (!(container.flags & NodeFlags.Static) &&
4849-
(container.kind !== SyntaxKind.Constructor || isNodeDescendentOf(node, (<ConstructorDeclaration>container).body))) {
4849+
(container.kind !== SyntaxKind.Constructor || isNodeDescendantOf(node, (<ConstructorDeclaration>container).body))) {
48504850
return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
48514851
}
48524852
}
@@ -7206,8 +7206,8 @@ namespace ts {
72067206
let container = getContainingClass(node);
72077207
while (container !== undefined) {
72087208
if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
7209-
getNodeLinks(container).flags |= NodeCheckFlags.ClassWithBodyScopedClassBinding;
7210-
getNodeLinks(node).flags |= NodeCheckFlags.BodyScopedClassBinding;
7209+
getNodeLinks(container).flags |= NodeCheckFlags.DecoratedClassWithSelfReference;
7210+
getNodeLinks(node).flags |= NodeCheckFlags.SelfReferenceInDecoratedClass;
72117211
break;
72127212
}
72137213

src/compiler/emitter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
346346
};
347347

348348
function isUniqueLocalName(name: string, container: Node): boolean {
349-
for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
349+
for (let node = container; isNodeDescendantOf(node, container); node = node.nextContainer) {
350350
if (node.locals && hasProperty(node.locals, name)) {
351351
// We conservatively include alias symbols to cover cases where they're emitted as locals
352352
if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
@@ -1529,7 +1529,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
15291529
return;
15301530
}
15311531
}
1532-
else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.BodyScopedClassBinding) {
1532+
else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.SelfReferenceInDecoratedClass) {
15331533
// Due to the emit for class decorators, any reference to the class from inside of the class body
15341534
// must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
15351535
// behavior of class names in ES6.
@@ -5203,7 +5203,7 @@ const _super = (function (geti, seti) {
52035203
// [Example 4]
52045204
//
52055205

5206-
if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithBodyScopedClassBinding) {
5206+
if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.DecoratedClassWithSelfReference) {
52075207
decoratedClassAlias = unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
52085208
decoratedClassAliases[getNodeId(node)] = decoratedClassAlias;
52095209
write(`let ${decoratedClassAlias};`);

src/compiler/printer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2368,7 +2368,7 @@ const _super = (function (geti, seti) {
23682368
}
23692369

23702370
function isUniqueLocalName(name: string, container: Node): boolean {
2371-
for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
2371+
for (let node = container; isNodeDescendantOf(node, container); node = node 4C2E .nextContainer) {
23722372
if (node.locals && hasProperty(node.locals, name)) {
23732373
// We conservatively include alias symbols to cover cases where they're emitted as locals
23742374
if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {

0 commit comments

Comments
 (0)
0