Make FormatContext.host optional since it’s not necessary if format o…

…ptions are all applied
microsoft · May 14, 2020 · ab09d67 · ab09d67
1 parent 0a696c9
commit ab09d67
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -3,7 +3,7 @@ namespace ts.formatting {
     export interface FormatContext {
         readonly options: FormatCodeSettings;
         readonly getRules: RulesMap;
-        readonly host: FormattingHost;
+        readonly host?: FormattingHost;
     }
 
     export interface TextRangeWithKind<T extends SyntaxKind = SyntaxKind> extends TextRange {

diff --git a/src/services/types.ts b/src/services/types.ts
@@ -203,15 +203,17 @@ namespace ts {
         has(dependencyName: string, inGroups?: PackageJsonDependencyGroup): boolean;
     }
 
+    /** @internal */
     export interface FormattingHost {
         getNewLine?(): string;
     }
 
     //
     // Public interface of the host of a language service instance.
     //
-    export interface LanguageServiceHost extends GetEffectiveTypeRootsHost, FormattingHost {
+    export interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
         getCompilationSettings(): CompilerOptions;
+        getNewLine?(): string;
         getProjectVersion?(): string;
         getScriptFileNames(): string[];
         getScriptKind?(fileName: string): ScriptKind;

diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -2085,9 +2085,9 @@ namespace ts {
     /**
      * The default is CRLF.
      */
-    export function getNewLineOrDefaultFromHost(host: FormattingHost, formatSettings?: FormatCodeSettings) {
-        return (formatSettings && formatSettings.newLineCharacter) ||
-            (host.getNewLine && host.getNewLine()) ||
+    export function getNewLineOrDefaultFromHost(host: FormattingHost | undefined, formatSettings?: FormatCodeSettings) {
+        return formatSettings?.newLineCharacter ||
+            host?.getNewLine?.() ||
             carriageReturnLineFeed;
     }