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

Commit

Permalink
fix static falling through in declare class Flow AST (#135)
Browse files Browse the repository at this point in the history
  • Loading branch information
danharper authored and hzoo committed Sep 21, 2016
1 parent 9cb73d8 commit b68918e
Show file tree
Hide file tree
Showing 3 changed files with 244 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/plugins/flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ pp.flowParseObjectType = function (allowStatic, allowExact) {
let nodeStart = this.startNode();
let node;
let propertyKey;
let isStatic;
let isStatic = false;

nodeStart.callProperties = [];
nodeStart.properties = [];
Expand Down Expand Up @@ -393,6 +393,8 @@ pp.flowParseObjectType = function (allowStatic, allowExact) {
nodeStart.properties.push(this.finishNode(node, "ObjectTypeProperty"));
}
}

isStatic = false;
}

this.expect(endDelim);
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/flow/declare-statements/17/actual.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare class X {
a: number;
static b: number;
c: number;
}
236 changes: 236 additions & 0 deletions test/fixtures/flow/declare-statements/17/expected.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
{
"type": "File",
"start": 0,
"end": 62,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 62,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"sourceType": "module",
"body": [
{
"type": "DeclareClass",
"start": 0,
"end": 62,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 14,
"end": 15,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 15
},
"identifierName": "X"
},
"name": "X"
},
"typeParameters": null,
"extends": [],
"mixins": [],
"body": {
"type": "ObjectTypeAnnotation",
"start": 16,
"end": 62,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 5,
"column": 1
}
},
"callProperties": [],
"properties": [
{
"type": "ObjectTypeProperty",
"start": 19,
"end": 29,
"loc": {
"start": {
"line": 2,
"column": 1
},
"end": {
"line": 2,
"column": 11
}
},
"key": {
"type": "Identifier",
"start": 19,
"end": 20,
"loc": {
"start": {
"line": 2,
"column": 1
},
"end": {
"line": 2,
"column": 2
},
"identifierName": "a"
},
"name": "a"
},
"value": {
"type": "NumberTypeAnnotation",
"start": 22,
"end": 28,
"loc": {
"start": {
"line": 2,
"column": 4
},
"end": {
"line": 2,
"column": 10
}
}
},
"optional": false,
"static": false
},
{
"type": "ObjectTypeProperty",
"start": 31,
"end": 48,
"loc": {
"start": {
"line": 3,
"column": 1
},
"end": {
"line": 3,
"column": 18
}
},
"key": {
"type": "Identifier",
"start": 38,
"end": 39,
"loc": {
"start": {
"line": 3,
"column": 8
},
"end": {
"line": 3,
"column": 9
},
"identifierName": "b"
},
"name": "b"
},
"value": {
"type": "NumberTypeAnnotation",
"start": 41,
"end": 47,
"loc": {
"start": {
"line": 3,
"column": 11
},
"end": {
"line": 3,
"column": 17
}
}
},
"optional": false,
"static": true
},
{
"type": "ObjectTypeProperty",
"start": 50,
"end": 60,
"loc": {
"start": {
"line": 4,
"column": 1
},
"end": {
"line": 4,
"column": 11
}
},
"key": {
"type": "Identifier",
"start": 50,
"end": 51,
"loc": {
"start": {
"line": 4,
"column": 1
},
"end": {
"line": 4,
"column": 2
},
"identifierName": "c"
},
"name": "c"
},
"value": {
"type": "NumberTypeAnnotation",
"start": 53,
"end": 59,
"loc": {
"start": {
"line": 4,
"column": 4
},
"end": {
"line": 4,
"column": 10
}
}
},
"optional": false,
"static": false
}
],
"indexers": [],
"exact": false
}
}
],
"directives": []
}
}

0 comments on commit b68918e

Please sign in to comment.