From 1d5050ecd6b27b8eec60eedbf1b11c7c6ec165eb Mon Sep 17 00:00:00 2001
From: Brian Ng <bng412@gmail.com>
Date: Thu, 4 May 2017 19:09:10 -0500
Subject: [PATCH] Allow flow class field to be named constructor

---
 src/plugins/flow.js                           |   4 +
 .../constructor-override/actual.js            |   3 +
 .../constructor-override/expected.json        | 169 ++++++++++++++++++
 .../constructor-override/options.json         |   3 +
 4 files changed, 179 insertions(+)
 create mode 100644 test/fixtures/flow/class-fields/constructor-override/actual.js
 create mode 100644 test/fixtures/flow/class-fields/constructor-override/expected.json
 create mode 100644 test/fixtures/flow/class-fields/constructor-override/options.json

diff --git a/src/plugins/flow.js b/src/plugins/flow.js
index cad3c4b645..f3a1b739a7 100644
--- a/src/plugins/flow.js
+++ b/src/plugins/flow.js
@@ -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) {
diff --git a/test/fixtures/flow/class-fields/constructor-override/actual.js b/test/fixtures/flow/class-fields/constructor-override/actual.js
new file mode 100644
index 0000000000..1db4f60888
--- /dev/null
+++ b/test/fixtures/flow/class-fields/constructor-override/actual.js
@@ -0,0 +1,3 @@
+class Foo {
+  constructor: () => this;
+}
diff --git a/test/fixtures/flow/class-fields/constructor-override/expected.json b/test/fixtures/flow/class-fields/constructor-override/expected.json
new file mode 100644
index 0000000000..721399cff9
--- /dev/null
+++ b/test/fixtures/flow/class-fields/constructor-override/expected.json
@@ -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": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/flow/class-fields/constructor-override/options.json b/test/fixtures/flow/class-fields/constructor-override/options.json
new file mode 100644
index 0000000000..3c8f72c900
--- /dev/null
+++ b/test/fixtures/flow/class-fields/constructor-override/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["jsx", "flow", "classProperties"]
+}