changed initial state transformation

Author: Keyan Zhang

transforms/__testfixtures__/class-test2.input.js

@@ -35,7 +35,7 @@ module.exports = React.createClass({
     };
   },
 
-  getInitialState: function() { // non-simple
+  getInitialState: function() { // non-simple getInitialState
     var data = 'bar';
     return {
       bar: data,

transforms/__testfixtures__/class-test2.output.js

@@ -33,12 +33,15 @@ module.exports = class extends React.Component {
     foo: 12,
   };
 
-  state = function() { // non-simple
+  constructor(props, context) {
+    super(props, context);
+    // non-simple getInitialState
     var data = 'bar';
-    return {
+
+    this.state = {
       bar: data,
     };
-  }();
+  }
 
   render() {
     return <div />;

transforms/class.js

@@ -255,20 +255,25 @@ module.exports = (file, api, options) => {
       fn.value
     ), fn);
 
-  const isInitialStateLiftable = getInitialState =>
-    getInitialState ?
-      j(getInitialState)
-        .find(j.MemberExpression, {
-          object: {
-            type: 'ThisExpression',
-          },
-          property: {
-            type: 'Identifier',
-            name: 'props',
-          },
-        })
-        .size() === 0 :
-      true;
+  const isInitialStateLiftable = getInitialState => {
+    if (!getInitialState || !(getInitialState.value)) {
+      return true;
+    } else if (!hasSingleReturnStatement(getInitialState.value)) {
+      return false;
+    }
+
+    return j(getInitialState)
+      .find(j.MemberExpression, {
+        object: {
+          type: 'ThisExpression',
+        },
+        property: {
+          type: 'Identifier',
+          name: 'props',
+        },
+      })
+      .size() === 0;
+  };
 
   const updatePropsAccess = getInitialState =>
     j(getInitialState)