Merge pull request #7158 from tschaub/comments
Retain comments when replacing nodes
This commit is contained in:
+13
-3
@@ -157,7 +157,9 @@ module.exports = function(info, api) {
|
|||||||
})
|
})
|
||||||
.replaceWith(path => {
|
.replaceWith(path => {
|
||||||
const name = `${path.value.object.name}.${path.value.property.name}`;
|
const name = `${path.value.object.name}.${path.value.property.name}`;
|
||||||
return j.literal(defines[name]);
|
const expression = j.literal(defines[name]);
|
||||||
|
expression.comments = path.value.comments;
|
||||||
|
return expression;
|
||||||
});
|
});
|
||||||
|
|
||||||
// remove goog.provide()
|
// remove goog.provide()
|
||||||
@@ -232,10 +234,18 @@ module.exports = function(info, api) {
|
|||||||
Object.keys(replacements).sort().reverse().forEach(name => {
|
Object.keys(replacements).sort().reverse().forEach(name => {
|
||||||
if (name.indexOf('.') > 0) {
|
if (name.indexOf('.') > 0) {
|
||||||
root.find(j.MemberExpression, getMemberExpression(name))
|
root.find(j.MemberExpression, getMemberExpression(name))
|
||||||
.replaceWith(j.identifier(replacements[name]));
|
.replaceWith(path => {
|
||||||
|
const expression = j.identifier(replacements[name]);
|
||||||
|
expression.comments = path.value.comments;
|
||||||
|
return expression;
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
root.find(j.Identifier, {name: name})
|
root.find(j.Identifier, {name: name})
|
||||||
.replaceWith(j.identifier(replacements[name]));
|
.replaceWith(path => {
|
||||||
|
const identifier = j.identifier(replacements[name]);
|
||||||
|
identifier.comments = path.value.comments;
|
||||||
|
return identifier;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user