improved the logic of repositioning state property

Author: Keyan Zhang

transforms/__testfixtures__/class-initial-state.input.js

@@ -107,6 +107,19 @@ var MyComponent4 = React.createClass({
   },
 });
 
+// but only accessing `this.props` and/or `this.context` is safe
+var MyComponent5 = React.createClass({
+  getInitialState: function() {
+    return {
+      heyoo: getContextFromInstance(this.props),
+    };
+  },
+
+  foo: function(): void {
+    this.setState({heyoo: 24});
+  },
+});
+
 // intense control flow testing
 var Loader = React.createClass({
   getInitialState() {

transforms/__testfixtures__/class-initial-state.output.js

@@ -114,6 +114,17 @@ class MyComponent4 extends React.Component {
   };
 }
 
+// but only accessing `this.props` and/or `this.context` is safe
+class MyComponent5 extends React.Component {
+  state = {
+    heyoo: getContextFromInstance(this.props),
+  };
+
+  foo = (): void => {
+    this.setState({heyoo: 24});
+  };
+}
+
 // intense control flow testing
 class Loader extends React.Component {
   constructor(props, context) {

transforms/class.js

@@ -788,7 +788,27 @@ module.exports = (file, api, options) => {
 
   // to ensure that our property initializers' evaluation order is safe
   const repositionStateProperty = (initialStateProperty, propertiesAndMethods) => {
-    if (j(initialStateProperty).find(j.ThisExpression).size() === 0) {
+    const initialStateCollection = j(initialStateProperty);
+    const thisCount = initialStateCollection.find(j.ThisExpression).size();
+    const safeThisMemberCount = initialStateCollection.find(j.MemberExpression, {
+      object: {
+        type: 'ThisExpression',
+      },
+      property: {
+        type: 'Identifier',
+        name: 'props',
+      },
+    }).size() + initialStateCollection.find(j.MemberExpression, {
+      object: {
+        type: 'ThisExpression',
+      },
+      property: {
+        type: 'Identifier',
+        name: 'context',
+      },
+    }).size();
+
+    if (thisCount === safeThisMemberCount) {
       return initialStateProperty.concat(propertiesAndMethods);
     }