Skip to content

Forbid this as constructor parameter type #5474

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

Merged
merged 6 commits into from
Nov 2, 2015
Merged
Show file tree
Hide file tree
Changes from 4 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
16 changes: 15 additions & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4420,12 +4420,26 @@ namespace ts {
let container = getThisContainer(node, /*includeArrowFunctions*/ false);
let parent = container && container.parent;
if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) {
if (!(container.flags & NodeFlags.Static)) {
if (!(container.flags & NodeFlags.Static) && !isConstructorParameter(node, container)) {
Copy link
Member

Choose a reason for hiding this comment

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

Instead of the isConstructorParameter function I would just modify the existing test:

if (!(container.flags & NodeFlags.Static) &&
    (container.kind !== SyntaxKind.Constructor || isNodeDescendentOf(node, (<ConstructorDeclaration>container).body))) {
    ...
}

The isNodeDescendentOf is currently a local helper in emitter.ts, so you need to move it to utilities.ts so it can be shared.

return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
}
}
error(node, Diagnostics.A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface);
return unknownType;

function isConstructorParameter(node: Node, container: Node) {
Copy link
Member

Choose a reason for hiding this comment

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

Just as an aside, nested local functions like this are more expensive than sibling functions because a new function object has to be created every time the outer function is invoked. But in this particular case, I'd just get rid of this function altogether.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK, I assumed that functions with no free variables would be lifted. I guess not.

Copy link
Member

Choose a reason for hiding this comment

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

That kind of optimization isn't technically part of any JS spec, but that kind of inlining is what you'd expect v8's crankshaft optimizing compiler (and now the TurboFan JIT) to do. You can't really know the performance profile against a given version of v8 without testing though, so it can be better to write slightly more optimized code to begin with, and avoid all the testing, knowing you've already done your best, rather than leaning on the compiler implementation.

For example, the reason nobody likes to use node 0.12 is because the v8 version within it had a (some) perf regression(s) whereby the opimizing compiler failed to optimize visitor-dispatch type patterns (obj[action]();), lowing their performance significantly compared to, say, a switch statement and non-variable lookups. This has since been fixed and the perf of the two is roughly equal again, but it just goes to show how little you can take for granted, and how much we rely on the compiler for speed.

if (container.kind === SyntaxKind.Constructor) {
let ctor = (<ConstructorDeclaration>container);
while (node && node !== ctor) {
if (node === ctor.body) {
return false;
}
node = node.parent;
}

return true;
}
}
}

function getTypeFromThisTypeNode(node: TypeNode): Type {
Expand Down
5 changes: 4 additions & 1 deletion tests/baselines/reference/declarationFiles.errors.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
tests/cases/conformance/types/thisType/declarationFiles.ts(5,20): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
tests/cases/conformance/types/thisType/declarationFiles.ts(31,5): error TS2527: The inferred type of 'x1' references an inaccessible 'this' type. A type annotation is necessary.
tests/cases/conformance/types/thisType/declarationFiles.ts(33,5): error TS2527: The inferred type of 'x3' references an inaccessible 'this' type. A type annotation is necessary.
tests/cases/conformance/types/thisType/declarationFiles.ts(35,5): error TS2527: The inferred type of 'f1' references an inaccessible 'this' type. A type annotation is necessary.
tests/cases/conformance/types/thisType/declarationFiles.ts(41,5): error TS2527: The inferred type of 'f3' references an inaccessible 'this' type. A type annotation is necessary.


==== tests/cases/conformance/types/thisType/declarationFiles.ts (4 errors) ====
==== tests/cases/conformance/types/thisType/declarationFiles.ts (5 errors) ====

class C1 {
x: this;
f(x: this): this { return undefined; }
constructor(x: this) { }
~~~~
!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
}

class C2 {
Expand Down
22 changes: 22 additions & 0 deletions tests/baselines/reference/thisTypeErrors2.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
tests/cases/conformance/types/thisType/thisTypeErrors2.ts(2,20): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
tests/cases/conformance/types/thisType/thisTypeErrors2.ts(9,38): error TS2526: A 'this' type is available only in a non-static member of a class or interface.


==== tests/cases/conformance/types/thisType/thisTypeErrors2.ts (2 errors) ====
class Base {
constructor(a: this) {
~~~~
!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
}
}
class Generic<T> {
}
class Derived {
n: number;
constructor(public host: Generic<this>) {
~~~~
!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
this.n = 12;
}
}

33 changes: 33 additions & 0 deletions tests/baselines/reference/thisTypeErrors2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//// [thisTypeErrors2.ts]
class Base {
constructor(a: this) {
}
}
class Generic<T> {
}
class Derived {
n: number;
constructor(public host: Generic<this>) {
this.n = 12;
}
}


//// [thisTypeErrors2.js]
var Base = (function () {
function Base(a) {
}
return Base;
})();
var Generic = (function () {
function Generic() {
}
return Generic;
})();
var Derived = (function () {
function Derived(host) {
this.host = host;
this.n = 12;
}
return Derived;
})();
57 changes: 57 additions & 0 deletions tests/baselines/reference/thisTypeInClasses.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
tests/cases/conformance/types/thisType/thisTypeInClasses.ts(4,20): error TS2526: A 'this' type is available only in a non-static member of a class or interface.


==== tests/cases/conformance/types/thisType/thisTypeInClasses.ts (1 errors) ====
class C1 {
x: this;
f(x: this): this { return undefined; }
constructor(x: this) { }
~~~~
!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
}

class C2 {
[x: string]: this;
}

interface Foo<T> {
x: T;
y: this;
}

class C3 {
a: this[];
b: [this, this];
c: this | Date;
d: this & Date;
e: (((this)));
f: (x: this) => this;
g: new (x: this) => this;
h: Foo<this>;
i: Foo<this | (() => this)>;
j: (x: any) => x is this;
}

declare class C4 {
x: this;
f(x: this): this;
}

class C5 {
foo() {
let f1 = (x: this): this => this;
let f2 = (x: this) => this;
let f3 = (x: this) => (y: this) => this;
let f4 = (x: this) => {
let g = (y: this) => {
return () => this;
}
return g(this);
}
}
bar() {
let x1 = <this>undefined;
let x2 = undefined as this;
}
}

12 changes: 12 additions & 0 deletions tests/cases/conformance/types/thisType/thisTypeErrors2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
class Base {
constructor(a: this) {
}
}
class Generic<T> {
}
class Derived {
n: number;
constructor(public host: Generic<this>) {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe use this in a type annotation of a local variable to test that this can be referenced in the body of a constructor.

this.n = 12;
}
}