diff --git a/.eslintrc.json b/.eslintrc.json index d10d3c3a265..1a586611b17 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -92,7 +92,7 @@ "no-trailing-spaces": "error", "no-undef-init": "error", "no-unsafe-finally": "error", - "no-unused-expressions": "error", + "no-unused-expressions": ["error", { "allowTernary": true }], "no-unused-labels": "error", "no-var": "error", "object-shorthand": "error", diff --git a/src/services/refactors/generateGetAccessorAndSetAccessor.ts b/src/services/refactors/generateGetAccessorAndSetAccessor.ts index 62427bdc688..7e4ca1a6645 100644 --- a/src/services/refactors/generateGetAccessorAndSetAccessor.ts +++ b/src/services/refactors/generateGetAccessorAndSetAccessor.ts @@ -214,17 +214,9 @@ namespace ts.refactor.generateGetAccessorAndSetAccessor { } function insertAccessor(changeTracker: textChanges.ChangeTracker, file: SourceFile, accessor: AccessorDeclaration, declaration: AcceptedDeclaration, container: ContainerDeclaration) { - if (isParameterPropertyDeclaration(declaration)) { - changeTracker.insertNodeAtClassStart(file, container, accessor); - } - else { - if (isPropertyAssignment(declaration)) { - changeTracker.insertNodeAfterComma(file, declaration, accessor); - } - else { - changeTracker.insertNodeAfter(file, declaration, accessor); - } - } + isParameterPropertyDeclaration(declaration) ? changeTracker.insertNodeAtClassStart(file, container, accessor) : + isPropertyAssignment(declaration) ? changeTracker.insertNodeAfterComma(file, declaration, accessor) : + changeTracker.insertNodeAfter(file, declaration, accessor); } function updateReadonlyPropertyInitializerStatementConstructor(changeTracker: textChanges.ChangeTracker, file: SourceFile, constructor: ConstructorDeclaration, fieldName: string, originalName: string) {