microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-11 10:46:28 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixes to emit / format for codeFix (#18484)

Browse Source
This commit is contained in:
Andy
2017-09-14 14:30:50 -07:00
committed by GitHub
parent 21bbdd33c5
commit 0747b33038
6 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/emitter.ts
View File

@@ -2417,6 +2417,12 @@ namespace ts {
const isEmpty = isUndefined || start >= children.length || count === 0;
if (isEmpty && format & ListFormat.OptionalIfEmpty) {
if (onBeforeEmitNodeArray) {
onBeforeEmitNodeArray(children);
}
if (onAfterEmitNodeArray) {
onAfterEmitNodeArray(children);
}
return;
}

2
src/harness/fourslash.ts
View File

@@ -3500,7 +3500,7 @@ ${code}
expected = makeWhitespaceVisible(expected);
actual = makeWhitespaceVisible(actual);
}
return `Expected:\n${expected}\nActual:${actual}`;
return `Expected:\n${expected}\nActual:\n${actual}`;
}
function differOnlyByWhitespace(a: string, b: string) {

5
src/services/formatting/rules.ts
View File

@@ -755,9 +755,8 @@ namespace ts.formatting {
return true;
case SyntaxKind.Block: {
const blockParent = context.currentTokenParent.parent;
if (blockParent.kind !== SyntaxKind.ArrowFunction &&
blockParent.kind !== SyntaxKind.FunctionExpression
) {
// In a codefix scenario, we can't rely on parents being set. So just always return true.
if (!blockParent || blockParent.kind !== SyntaxKind.ArrowFunction && blockParent.kind !== SyntaxKind.FunctionExpression) {
return true;
}
}