Fix source location for JSXEmptyExpression nodes (fixes #248) (#249)

babel · Dec 14, 2016 · ba96b91 · ba96b91
1 parent 4958225
commit ba96b91
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 deletions.
diff --git a/src/plugins/jsx/index.js b/src/plugins/jsx/index.js
@@ -261,8 +261,8 @@ pp.jsxParseAttributeValue = function() {
 // at the beginning of the next one (right brace).
 
 pp.jsxParseEmptyExpression = function() {
-  let node = this.startNodeAt(this.lastTokEnd, this.lastTokEndLoc);
-  return this.finishNodeAt(node, "JSXEmptyExpression", this.start, this.startLoc);
+  let node = this.startNodeAt(this.state.lastTokEnd, this.state.lastTokEndLoc);
+  return this.finishNodeAt(node, "JSXEmptyExpression", this.state.start, this.state.startLoc);
 };
 
 // Parse JSX spread child

diff --git a/test/fixtures/jsx/basic/10/expected.json b/test/fixtures/jsx/basic/10/expected.json
@@ -137,8 +137,20 @@
               },
               "expression": {
                 "type": "JSXEmptyExpression",
-                "loc": {},
-                "leadingComments": [
+                "start": 4,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 27
+                  }
+                },
+                "leadingComments": null,
+                "innerComments": [
                   {
                     "type": "CommentBlock",
                     "value": " this is a comment ",
@@ -156,26 +168,7 @@
                     }
                   }
                 ]
-              },
-              "leadingComments": null,
-              "innerComments": [
-                {
-                  "type": "CommentBlock",
-                  "value": " this is a comment ",
-                  "start": 4,
-                  "end": 27,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 4
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 27
-                    }
-                  }
-                }
-              ]
+              }
             }
           ]
         }
@@ -201,4 +194,4 @@
       }
     }
   ]
-}
+}