From 40751ba89b343acab7731689d44b9f67b43bb7bf Mon Sep 17 00:00:00 2001 From: Armando Aguirre Date: Fri, 22 May 2020 21:50:34 -0700 Subject: [PATCH] Removed public commands --- src/server/protocol.ts | 19 ----- src/server/session.ts | 74 ++++--------------- src/testRunner/unittests/tsserver/session.ts | 8 +- .../reference/api/tsserverlibrary.d.ts | 17 ----- 4 files changed, 19 insertions(+), 99 deletions(-) diff --git a/src/server/protocol.ts b/src/server/protocol.ts index 597c69d474f..cc027f8e950 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -136,16 +136,12 @@ namespace ts.server.protocol { SelectionRange = "selectionRange", /* @internal */ SelectionRangeFull = "selectionRange-full", - ToggleLineComment = "toggleLineComment", /* @internal */ ToggleLineCommentFull = "toggleLineComment-full", - ToggleMultilineComment = "toggleMultilineComment", /* @internal */ ToggleMultilineCommentFull = "toggleMultilineComment-full", - CommentSelection = "commentSelection", /* @internal */ CommentSelectionFull = "commentSelection-full", - UncommentSelection = "uncommentSelection", /* @internal */ UncommentSelectionFull = "uncommentSelection-full", PrepareCallHierarchy = "prepareCallHierarchy", @@ -1544,23 +1540,8 @@ namespace ts.server.protocol { parent?: SelectionRange; } - export interface ToggleLineCommentRequest extends FileRequest { - command: CommandTypes.ToggleLineComment; - arguments: FileRangeRequestArgs; - } - - export interface ToggleMultilineCommentRequest extends FileRequest { - command: CommandTypes.ToggleMultilineComment; - arguments: FileRangeRequestArgs; - } - export interface CommentSelectionRequest extends FileRequest { - command: CommandTypes.CommentSelection; - arguments: FileRangeRequestArgs; - } - export interface UncommentSelectionRequest extends FileRequest { - command: CommandTypes.UncommentSelection; arguments: FileRangeRequestArgs; } diff --git a/src/server/session.ts b/src/server/session.ts index 96a4b676907..e631578fb51 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -2201,68 +2201,36 @@ namespace ts.server { }); } - private toggleLineComment(args: protocol.FileRangeRequestArgs, simplifiedResult: boolean): TextChange[] | protocol.CodeEdit[] { + private toggleLineComment(args: protocol.FileRangeRequestArgs): TextChange[] { const { file, project } = this.getFileAndProject(args); const scriptInfo = project.getScriptInfoForNormalizedPath(file)!; const textRange = this.getRange(args, scriptInfo); - const textChanges = project.getLanguageService().toggleLineComment(file, textRange); - - if (simplifiedResult) { - const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!; - - return textChanges.map(textChange => this.convertTextChangeToCodeEdit(textChange, scriptInfo)); - } - - return textChanges; + return project.getLanguageService().toggleLineComment(file, textRange); } - private toggleMultilineComment(args: protocol.FileRangeRequestArgs, simplifiedResult: boolean): TextChange[] | protocol.CodeEdit[] { + private toggleMultilineComment(args: protocol.FileRangeRequestArgs): TextChange[] { const { file, project } = this.getFileAndProject(args); const scriptInfo = project.getScriptInfoForNormalizedPath(file)!; const textRange = this.getRange(args, scriptInfo); - const textChanges = project.getLanguageService().toggleMultilineComment(file, textRange); - - if (simplifiedResult) { - const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!; - - return textChanges.map(textChange => this.convertTextChangeToCodeEdit(textChange, scriptInfo)); - } - - return textChanges; + return project.getLanguageService().toggleMultilineComment(file, textRange); } - private commentSelection(args: protocol.FileRangeRequestArgs, simplifiedResult: boolean): TextChange[] | protocol.CodeEdit[] { + private commentSelection(args: protocol.FileRangeRequestArgs): TextChange[] { const { file, project } = this.getFileAndProject(args); const scriptInfo = project.getScriptInfoForNormalizedPath(file)!; const textRange = this.getRange(args, scriptInfo); - const textChanges = project.getLanguageService().commentSelection(file, textRange); - - if (simplifiedResult) { - const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!; - - return textChanges.map(textChange => this.convertTextChangeToCodeEdit(textChange, scriptInfo)); - } - - return textChanges; + return project.getLanguageService().commentSelection(file, textRange); } - private uncommentSelection(args: protocol.FileRangeRequestArgs, simplifiedResult: boolean): TextChange[] | protocol.CodeEdit[] { + private uncommentSelection(args: protocol.FileRangeRequestArgs): TextChange[] { const { file, project } = this.getFileAndProject(args); const scriptInfo = project.getScriptInfoForNormalizedPath(file)!; const textRange = this.getRange(args, scriptInfo); - const textChanges = project.getLanguageService().uncommentSelection(file, textRange); - - if (simplifiedResult) { - const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!; - - return textChanges.map(textChange => this.convertTextChangeToCodeEdit(textChange, scriptInfo)); - } - - return textChanges; + return project.getLanguageService().uncommentSelection(file, textRange); } private mapSelectionRange(selectionRange: SelectionRange, scriptInfo: ScriptInfo): protocol.SelectionRange { @@ -2710,29 +2678,17 @@ namespace ts.server { [CommandNames.ProvideCallHierarchyOutgoingCalls]: (request: protocol.ProvideCallHierarchyOutgoingCallsRequest) => { return this.requiredResponse(this.provideCallHierarchyOutgoingCalls(request.arguments)); }, - [CommandNames.ToggleLineComment]: (request: protocol.ToggleLineCommentRequest) => { - return this.requiredResponse(this.toggleLineComment(request.arguments, /*simplifiedResult*/ true)); + [CommandNames.ToggleLineCommentFull]: (request: protocol.CommentSelectionRequest) => { + return this.requiredResponse(this.toggleLineComment(request.arguments)); }, - [CommandNames.ToggleLineCommentFull]: (request: protocol.ToggleLineCommentRequest) => { - return this.requiredResponse(this.toggleLineComment(request.arguments, /*simplifiedResult*/ false)); - }, - [CommandNames.ToggleMultilineComment]: (request: protocol.ToggleMultilineCommentRequest) => { - return this.requiredResponse(this.toggleMultilineComment(request.arguments, /*simplifiedResult*/ true)); - }, - [CommandNames.ToggleMultilineCommentFull]: (request: protocol.ToggleMultilineCommentRequest) => { - return this.requiredResponse(this.toggleMultilineComment(request.arguments, /*simplifiedResult*/ false)); - }, - [CommandNames.CommentSelection]: (request: protocol.CommentSelectionRequest) => { - return this.requiredResponse(this.commentSelection(request.arguments, /*simplifiedResult*/ true)); + [CommandNames.ToggleMultilineCommentFull]: (request: protocol.CommentSelectionRequest) => { + return this.requiredResponse(this.toggleMultilineComment(request.arguments)); }, [CommandNames.CommentSelectionFull]: (request: protocol.CommentSelectionRequest) => { - return this.requiredResponse(this.commentSelection(request.arguments, /*simplifiedResult*/ false)); + return this.requiredResponse(this.commentSelection(request.arguments)); }, - [CommandNames.UncommentSelection]: (request: protocol.UncommentSelectionRequest) => { - return this.requiredResponse(this.uncommentSelection(request.arguments, /*simplifiedResult*/ true)); - }, - [CommandNames.UncommentSelectionFull]: (request: protocol.UncommentSelectionRequest) => { - return this.requiredResponse(this.uncommentSelection(request.arguments, /*simplifiedResult*/ false)); + [CommandNames.UncommentSelectionFull]: (request: protocol.CommentSelectionRequest) => { + return this.requiredResponse(this.uncommentSelection(request.arguments)); }, }); diff --git a/src/testRunner/unittests/tsserver/session.ts b/src/testRunner/unittests/tsserver/session.ts index 5ca88f4adb9..8203f5187ae 100644 --- a/src/testRunner/unittests/tsserver/session.ts +++ b/src/testRunner/unittests/tsserver/session.ts @@ -272,10 +272,10 @@ namespace ts.server { CommandNames.PrepareCallHierarchy, CommandNames.ProvideCallHierarchyIncomingCalls, CommandNames.ProvideCallHierarchyOutgoingCalls, - CommandNames.ToggleLineComment, - CommandNames.ToggleMultilineComment, - CommandNames.CommentSelection, - CommandNames.UncommentSelection, + CommandNames.ToggleLineCommentFull, + CommandNames.ToggleMultilineCommentFull, + CommandNames.CommentSelectionFull, + CommandNames.UncommentSelectionFull, ]; it("should not throw when commands are executed with invalid arguments", () => { diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 8971b73149e..d8ee834cfa7 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -6304,10 +6304,6 @@ declare namespace ts.server.protocol { GetEditsForFileRename = "getEditsForFileRename", ConfigurePlugin = "configurePlugin", SelectionRange = "selectionRange", - ToggleLineComment = "toggleLineComment", - ToggleMultilineComment = "toggleMultilineComment", - CommentSelection = "commentSelection", - UncommentSelection = "uncommentSelection", PrepareCallHierarchy = "prepareCallHierarchy", ProvideCallHierarchyIncomingCalls = "provideCallHierarchyIncomingCalls", ProvideCallHierarchyOutgoingCalls = "provideCallHierarchyOutgoingCalls" @@ -7332,20 +7328,7 @@ declare namespace ts.server.protocol { textSpan: TextSpan; parent?: SelectionRange; } - interface ToggleLineCommentRequest extends FileRequest { - command: CommandTypes.ToggleLineComment; - arguments: FileRangeRequestArgs; - } - interface ToggleMultilineCommentRequest extends FileRequest { - command: CommandTypes.ToggleMultilineComment; - arguments: FileRangeRequestArgs; - } interface CommentSelectionRequest extends FileRequest { - command: CommandTypes.CommentSelection; - arguments: FileRangeRequestArgs; - } - interface UncommentSelectionRequest extends FileRequest { - command: CommandTypes.UncommentSelection; arguments: FileRangeRequestArgs; } /**