github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-05-03 03:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

JSX empty expression location data (#5189)

Browse Source
This commit is contained in:
Julian Rosse
2019-03-31 18:04:08 -04:00
committed by Geoffrey Booth
parent 28a1a1d304
commit 7e0eb6a92d
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/coffeescript/nodes.js
View File

@@ -2512,7 +2512,7 @@
}
contentAst(o) {
var base1, child, children, content, element, expression, j, len1, results, unwrapped;
var base1, child, children, content, element, emptyExpression, expression, j, len1, results, unwrapped;
if (!(this.content && !(typeof (base1 = this.content.base).isEmpty === "function" ? base1.isEmpty() : void 0))) {
return [];
}
@@ -2533,7 +2533,25 @@
} else {
({expression} = element);
if (expression == null) {
results.push(new JSXEmptyExpression().withLocationDataFrom(element));
emptyExpression = new JSXEmptyExpression();
// We don’t currently have a token corresponding to the empty space
// between the JSX expression braces, so piece together the location
// data by trimming the braces from the Interpolation’s location data.
// Technically the last_line/last_column calculation here could be
// incorrect if the ending brace is preceded by a newline, but
// last_line/last_column aren’t used for AST generation anyway.
emptyExpression.locationData = {
first_line: element.locationData.first_line,
first_column: element.locationData.first_column + 1,
last_line: element.locationData.last_line,
last_column: element.locationData.last_column - 1,
last_line_exclusive: element.locationData.last_line,
last_column_exclusive: element.locationData.last_column,
range: [element.locationData.range[0] + 1, element.locationData.range[1] - 1]
};
results.push(new JSXExpressionContainer(emptyExpression, {
locationData: element.locationData
}));
} else {
unwrapped = expression.unwrapAll();
if (unwrapped instanceof JSXElement) {

20
src/nodes.coffee
View File

@@ -1718,7 +1718,25 @@ exports.JSXElement = class JSXElement extends Base
else # Interpolation
{expression} = element
unless expression?
new JSXEmptyExpression().withLocationDataFrom element
emptyExpression = new JSXEmptyExpression()
# We don’t currently have a token corresponding to the empty space
# between the JSX expression braces, so piece together the location
# data by trimming the braces from the Interpolation’s location data.
# Technically the last_line/last_column calculation here could be
# incorrect if the ending brace is preceded by a newline, but
# last_line/last_column aren’t used for AST generation anyway.
emptyExpression.locationData =
first_line: element.locationData.first_line
first_column: element.locationData.first_column + 1
last_line: element.locationData.last_line
last_column: element.locationData.last_column - 1
last_line_exclusive: element.locationData.last_line
last_column_exclusive: element.locationData.last_column
range: [
element.locationData.range[0] + 1
element.locationData.range[1] - 1
]
new JSXExpressionContainer emptyExpression, locationData: element.locationData
else
unwrapped = expression.unwrapAll()
if unwrapped instanceof JSXElement

4
test/abstract_syntax_tree.coffee
View File

@@ -425,7 +425,9 @@ test "AST as expected for JSXTag node", ->
raw: 'abc'
value: 'abc'
,
type: 'JSXEmptyExpression'
type: 'JSXExpressionContainer'
expression:
type: 'JSXEmptyExpression'
]
# test "AST as expected for PropertyName node", ->

11
test/abstract_syntax_tree_location_data.coffee
View File

@@ -2996,6 +2996,17 @@ test "AST location data as expected for JSXTag node", ->
line: 1
column: 5
,
expression:
start: 6
end: 6
range: [6, 6]
loc:
start:
line: 1
column: 6
end:
line: 1
column: 6
start: 5
end: 7
range: [5, 7]