Skip to content
This repository has been archived by the owner on May 19, 2018. It is now read-only.

Allow flow class field to be named constructor #510

Merged
merged 1 commit into from
May 10, 2017
Merged

Allow flow class field to be named constructor #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/plugins/flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,10 @@ export default (superClass: Class<Parser>): Class<Parser> => class extends super
return this.match(tt.colon) || super.isClassProperty();
}

isNonstaticConstructor(method: N.ClassMethod): boolean {
return !this.match(tt.colon) && super.isNonstaticConstructor(method);
}

// parse type parameters for class methods
parseClassMethod(classBody: N.ClassBody, method: N.ClassMethod, ...args): void {
if (method.variance) {
Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/flow/classes/constructor-override-with-class-prop-plugin/actual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class Foo {
constructor: () => this;
}
169 changes: 169 additions & 0 deletions test/fixtures/flow/classes/constructor-override-with-class-prop-plugin/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
{
"type": "File",
"start": 0,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"sourceType": "module",
"body": [
{
"type": "ClassDeclaration",
"start": 0,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 6,
"end": 9,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 9
},
"identifierName": "Foo"
},
"name": "Foo"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start": 10,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 3,
"column": 1
}
},
"body": [
{
"type": "ClassProperty",
"start": 14,
"end": 38,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 26
}
},
"static": false,
"computed": false,
"key": {
"type": "Identifier",
"start": 14,
"end": 25,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 13
},
"identifierName": "constructor"
},
"name": "constructor"
},
"variance": null,
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 25,
"end": 37,
"loc": {
"start": {
"line": 2,
"column": 13
},
"end": {
"line": 2,
"column": 25
}
},
"typeAnnotation": {
"type": "FunctionTypeAnnotation",
"start": 27,
"end": 37,
"loc": {
"start": {
"line": 2,
"column": 15
},
"end": {
"line": 2,
"column": 25
}
},
"params": [],
"rest": null,
"returnType": {
"type": "ThisTypeAnnotation",
"start": 33,
"end": 37,
"loc": {
"start": {
"line": 2,
"column": 21
},
"end": {
"line": 2,
"column": 25
}
},
"value": true
},
"typeParameters": null
}
},
"value": null
}
]
}
}
],
"directives": []
}
}
3 changes: 3 additions & 0 deletions test/fixtures/flow/classes/constructor-override-with-class-prop-plugin/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": ["jsx", "flow", "classProperties"]
}
5 changes: 5 additions & 0 deletions test/fixtures/flow/classes/constructor-with-class-prop-plugin/actual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class A {
constructor(): Object {
return {};
}
}
Loading