Ensure getNewLineFromContext never returns undefined

amcasey · amcasey · commit 13bf7f9c7c39 · 2018-01-17T15:37:05.000-08:00
diff --git a/src/services/refactorProvider.ts b/src/services/refactorProvider.ts
@@ -21,7 +21,7 @@ namespace ts {
 
     export function getNewLineFromContext(context: RefactorOrCodeFixContext) {
         const formatSettings = context.formatContext.options;
-        return formatSettings ? formatSettings.newLineCharacter : context.host.getNewLine();
+        return (formatSettings && formatSettings.newLineCharacter) || getNewLineOrDefaultFromHost(context.host);
     }
 
     export function toTextChangesContext(context: RefactorOrCodeFixContext): textChanges.TextChangesContext {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace ts {`
`21`	`21`
`22`	`22`	`export function getNewLineFromContext(context: RefactorOrCodeFixContext) {`
`23`	`23`	`const formatSettings = context.formatContext.options;`
`24`		`- return formatSettings ? formatSettings.newLineCharacter : context.host.getNewLine();`
	`24`	`+ return (formatSettings && formatSettings.newLineCharacter) \|\| getNewLineOrDefaultFromHost(context.host);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`export function toTextChangesContext(context: RefactorOrCodeFixContext): textChanges.TextChangesContext {`