cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ngcc): better detection of end of decorator expression (#33192)

Browse Source 
for removal of decorator from __decorate calls.

FW-1629 #resolve

PR Close #33192
This commit is contained in:
Alex Rickabaugh
2019-10-02 10:45:47 +03:00
committed by Matias Niemelä
parent 4da2dda647
commit 50710838bf
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
View File

@ -99,9 +99,17 @@ export class EsmRenderingFormatter implements RenderingFormatter {
} else {
nodesToRemove.forEach(node => {
// remove any trailing comma
const end = (output.slice(node.getEnd(), node.getEnd() + 1) === ',') ?
node.getEnd() + 1 :
node.getEnd();
const nextSibling = getNextSiblingInArray(node, items);
let end: number;
if (nextSibling !== null &&
output.slice(nextSibling.getFullStart() - 1, nextSibling.getFullStart()) === ',') {
end = nextSibling.getFullStart() - 1 + nextSibling.getLeadingTriviaWidth();
} else if (output.slice(node.getEnd(), node.getEnd() + 1) === ',') {
end = node.getEnd() + 1;
} else {
end = node.getEnd();
}
output.remove(node.getFullStart(), end);
});
}
@ -214,3 +222,8 @@ function generateImportString(
const importAs = importPath ? importManager.generateNamedImport(importPath, importName) : null;
return importAs ? `${importAs.moduleImport}.${importAs.symbol}` : `${importName}`;
}
function getNextSiblingInArray<T extends ts.Node>(node: T, array: ts.NodeArray<T>): T|null {
const index = array.indexOf(node);
return index !== -1 && array.length > index + 1 ? array[index + 1] : null;
}