Make API changes internal

Author: Andy Hanson

Diff for: src/server/client.ts

@@ -559,7 +559,8 @@ namespace ts.server {
             const request = this.processRequest<protocol.CodeFixRequest>(CommandNames.GetCodeFixes, args);
             const response = this.processResponse<protocol.CodeFixResponse>(request);
 
-            return response.body.map(({ description, changes, fixId }) => ({ description, changes: this.convertChanges(changes, file), fixId }));
+            // TODO: GH#20538 shouldn't need cast
+            return (response.body as protocol.CodeFixAction[]).map(({ description, changes, fixId }) => ({ description, changes: this.convertChanges(changes, file), fixId }));
         }
 
         getCombinedCodeFix = notImplemented;

Diff for: src/server/protocol.ts

@@ -101,6 +101,8 @@ namespace ts.server.protocol {
         GetCodeFixes = "getCodeFixes",
         /* @internal */
         GetCodeFixesFull = "getCodeFixes-full",
+        // TODO: GH#20538
+        /* @internal */
         GetCombinedCodeFix = "getCombinedCodeFix",
         /* @internal */
         GetCombinedCodeFixFull = "getCombinedCodeFix-full",
@@ -536,11 +538,15 @@ namespace ts.server.protocol {
         arguments: CodeFixRequestArgs;
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface GetCombinedCodeFixRequest extends Request {
         command: CommandTypes.GetCombinedCodeFix;
         arguments: GetCombinedCodeFixRequestArgs;
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface GetCombinedCodeFixResponse  extends Response {
         body: CombinedCodeActions;
     }
@@ -597,11 +603,15 @@ namespace ts.server.protocol {
         errorCodes?: number[];
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface GetCombinedCodeFixRequestArgs {
         scope: GetCombinedCodeFixScope;
         fixId: {};
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface GetCombinedCodeFixScope {
         type: "file";
         args: FileRequestArgs;
@@ -1590,7 +1600,7 @@ namespace ts.server.protocol {
 
     export interface CodeFixResponse extends Response {
         /** The code actions that are available */
-        body?: CodeFixAction[];
+        body?: CodeAction[]; // TODO: GH#20538 CodeFixAction[]
     }
 
     export interface CodeAction {
@@ -1602,11 +1612,15 @@ namespace ts.server.protocol {
         commands?: {}[];
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface CombinedCodeActions {
         changes: FileCodeEdits[];
         commands?: {}[];
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface CodeFixAction extends CodeAction {
         /** If present, one may call 'getCombinedCodeFix' with this fixId. */
         fixId?: {};

Diff for: src/services/types.ts

@@ -294,7 +294,10 @@ namespace ts {
 
         getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan;
 
-        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeFixAction[];
+        // TODO: GH#20538 return `CodeFixAction[]`
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[];
+        // TODO: GH#20538
+        /* @internal */
         getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings): CombinedCodeActions;
         applyCodeActionCommand(action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
         applyCodeActionCommand(action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
@@ -323,6 +326,8 @@ namespace ts {
         dispose(): void;
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface CombinedCodeFixScope { type: "file"; fileName: string; }
 
     export interface GetCompletionsAtPositionOptions {
@@ -412,11 +417,15 @@ namespace ts {
         commands?: CodeActionCommand[];
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface CodeFixAction extends CodeAction {
         /** If present, one may call 'getCombinedCodeFix' with this fixId. */
         fixId?: {};
     }
 
+    // TODO: GH#20538
+    /* @internal */
     export interface CombinedCodeActions {
         changes: FileTextChanges[];
         commands: CodeActionCommand[] | undefined;

Diff for: tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -3983,8 +3983,7 @@ declare namespace ts {
         getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
         isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
         getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan;
-        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeFixAction[];
-        getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings): CombinedCodeActions;
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[];
         applyCodeActionCommand(action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
         applyCodeActionCommand(action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
         applyCodeActionCommand(action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
@@ -4000,10 +3999,6 @@ declare namespace ts {
         getProgram(): Program;
         dispose(): void;
     }
-    interface CombinedCodeFixScope {
-        type: "file";
-        fileName: string;
-    }
     interface GetCompletionsAtPositionOptions {
         includeExternalModuleExports: boolean;
     }
@@ -4080,14 +4075,6 @@ declare namespace ts {
          */
         commands?: CodeActionCommand[];
     }
-    interface CodeFixAction extends CodeAction {
-        /** If present, one may call 'getCombinedCodeFix' with this fixId. */
-        fixId?: {};
-    }
-    interface CombinedCodeActions {
-        changes: FileTextChanges[];
-        commands: CodeActionCommand[] | undefined;
-    }
     type CodeActionCommand = InstallPackageAction;
     interface InstallPackageAction {
     }
@@ -4929,7 +4916,6 @@ declare namespace ts.server.protocol {
         DocCommentTemplate = "docCommentTemplate",
         CompilerOptionsForInferredProjects = "compilerOptionsForInferredProjects",
         GetCodeFixes = "getCodeFixes",
-        GetCombinedCodeFix = "getCombinedCodeFix",
         ApplyCodeActionCommand = "applyCodeActionCommand",
         GetSupportedCodeFixes = "getSupportedCodeFixes",
         GetApplicableRefactors = "getApplicableRefactors",
@@ -5277,13 +5263,6 @@ declare namespace ts.server.protocol {
         command: CommandTypes.GetCodeFixes;
         arguments: CodeFixRequestArgs;
     }
-    interface GetCombinedCodeFixRequest extends Request {
-        command: CommandTypes.GetCombinedCodeFix;
-        arguments: GetCombinedCodeFixRequestArgs;
-    }
-    interface GetCombinedCodeFixResponse extends Response {
-        body: CombinedCodeActions;
-    }
     interface ApplyCodeActionCommandRequest extends Request {
         command: CommandTypes.ApplyCodeActionCommand;
         arguments: ApplyCodeActionCommandRequestArgs;
@@ -5317,14 +5296,6 @@ declare namespace ts.server.protocol {
          */
         errorCodes?: number[];
     }
-    interface GetCombinedCodeFixRequestArgs {
-        scope: GetCombinedCodeFixScope;
-        fixId: {};
-    }
-    interface GetCombinedCodeFixScope {
-        type: "file";
-        args: FileRequestArgs;
-    }
     interface ApplyCodeActionCommandRequestArgs {
         /** May also be an array of commands. */
         command: {};
@@ -6067,7 +6038,7 @@ declare namespace ts.server.protocol {
     }
     interface CodeFixResponse extends Response {
         /** The code actions that are available */
-        body?: CodeFixAction[];
+        body?: CodeAction[];
     }
     interface CodeAction {
         /** Description of the code action to display in the UI of the editor */
@@ -6077,14 +6048,6 @@ declare namespace ts.server.protocol {
         /** A command is an opaque object that should be passed to `ApplyCodeActionCommandRequestArgs` without modification.  */
         commands?: {}[];
     }
-    interface CombinedCodeActions {
-        changes: FileCodeEdits[];
-        commands?: {}[];
-    }
-    interface CodeFixAction extends CodeAction {
-        /** If present, one may call 'getCombinedCodeFix' with this fixId. */
-        fixId?: {};
-    }
     /**
      * Format and format on key response message.
      */

Diff for: tests/baselines/reference/api/typescript.d.ts

@@ -3983,8 +3983,7 @@ declare namespace ts {
         getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
         isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
         getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan;
-        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeFixAction[];
-        getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings): CombinedCodeActions;
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[];
         applyCodeActionCommand(action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
         applyCodeActionCommand(action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
         applyCodeActionCommand(action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
@@ -4000,10 +3999,6 @@ declare namespace ts {
         getProgram(): Program;
         dispose(): void;
     }
-    interface CombinedCodeFixScope {
-        type: "file";
-        fileName: string;
-    }
     interface GetCompletionsAtPositionOptions {
         includeExternalModuleExports: boolean;
     }
@@ -4080,14 +4075,6 @@ declare namespace ts {
          */
         commands?: CodeActionCommand[];
     }
-    interface CodeFixAction extends CodeAction {
-        /** If present, one may call 'getCombinedCodeFix' with this fixId. */
-        fixId?: {};
-    }
-    interface CombinedCodeActions {
-        changes: FileTextChanges[];
-        commands: CodeActionCommand[] | undefined;
-    }
     type CodeActionCommand = InstallPackageAction;
     interface InstallPackageAction {
     }