Skip to content

Don't emit __extends if one is already in scope #1356

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7886,7 +7886,7 @@ module ts {
var staticType = <ObjectType>getTypeOfSymbol(symbol);
var baseTypeNode = getClassBaseTypeNode(node);
if (baseTypeNode) {
emitExtends = emitExtends || !isInAmbientContext(node);
emitExtends = emitExtends || !(isInAmbientContext(node) || resolveName(node.parent, escapeIdentifier('__extends'), SymbolFlags.Value, undefined, undefined));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would this work:

module M {
  export var __extends = () =>{};

  class A { }
  class B extends A { }
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Should we have the emitter handle this, or just say that only a global __extends is valid?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can go either ways. limiting it to global __extends seems simple to implement and handles common scenarios.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please break this into multiple lines. Or provide a helper function for it.

checkTypeReference(baseTypeNode);
}
if (type.baseTypes.length) {
Expand Down
20 changes: 20 additions & 0 deletions tests/baselines/reference/__extends.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//// [__extends.ts]
var __extends;

class A { }
class B extends A { }

//// [__extends.js]
var __extends;
var A = (function () {
function A() {
}
return A;
})();
var B = (function (_super) {
__extends(B, _super);
function B() {
_super.apply(this, arguments);
}
return B;
})(A);
11 changes: 11 additions & 0 deletions tests/baselines/reference/__extends.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
=== tests/cases/compiler/__extends.ts ===
var __extends;
>__extends : any

class A { }
>A : A

class B extends A { }
>B : B
>A : A

19 changes: 19 additions & 0 deletions tests/baselines/reference/__extendsAmbient.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//// [__extendsAmbient.ts]
declare var __extends;

class A { }
class B extends A { }

//// [__extendsAmbient.js]
var A = (function () {
function A() {
}
return A;
})();
var B = (function (_super) {
__extends(B, _super);
function B() {
_super.apply(this, arguments);
}
return B;
})(A);
11 changes: 11 additions & 0 deletions tests/baselines/reference/__extendsAmbient.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
=== tests/cases/compiler/__extendsAmbient.ts ===
declare var __extends;
>__extends : any

class A { }
>A : A

class B extends A { }
>B : B
>A : A

32 changes: 32 additions & 0 deletions tests/baselines/reference/__extendsModule.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//// [__extendsModule.ts]

module M {
export var __extends;
}

class A { }
class B extends A { }

//// [__extendsModule.js]
var __extends = this.__extends || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
function __() { this.constructor = d; }
__.prototype = b.prototype;
d.prototype = new __();
};
var M;
(function (M) {
M.__extends;
})(M || (M = {}));
var A = (function () {
function A() {
}
return A;
})();
var B = (function (_super) {
__extends(B, _super);
function B() {
_super.apply(this, arguments);
}
return B;
})(A);
16 changes: 16 additions & 0 deletions tests/baselines/reference/__extendsModule.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
=== tests/cases/compiler/__extendsModule.ts ===

module M {
>M : typeof M

export var __extends;
>__extends : any
}

class A { }
>A : A

class B extends A { }
>B : B
>A : A

25 changes: 25 additions & 0 deletions tests/baselines/reference/__extendsMultifile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//// [tests/cases/compiler/__extendsMultifile.ts] ////

//// [foo.ts]

declare var __extends;

//// [bar.ts]
class A { }
class B extends A { }


//// [foo.js]
//// [bar.js]
var A = (function () {
function A() {
}
return A;
})();
var B = (function (_super) {
__extends(B, _super);
function B() {
_super.apply(this, arguments);
}
return B;
})(A);
13 changes: 13 additions & 0 deletions tests/baselines/reference/__extendsMultifile.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/foo.ts ===

declare var __extends;
>__extends : any

=== tests/cases/compiler/bar.ts ===
class A { }
>A : A

class B extends A { }
>B : B
>A : A

4 changes: 4 additions & 0 deletions tests/cases/compiler/__extends.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
var __extends;

class A { }
class B extends A { }
4 changes: 4 additions & 0 deletions tests/cases/compiler/__extendsAmbient.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare var __extends;

class A { }
class B extends A { }
7 changes: 7 additions & 0 deletions tests/cases/compiler/__extendsModule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

module M {
export var __extends;
}

class A { }
class B extends A { }
7 changes: 7 additions & 0 deletions tests/cases/compiler/__extendsMultifile.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

// @Filename: foo.ts
declare var __extends;

// @Filename: bar.ts
class A { }
class B extends A { }