mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-11-18 20:11:14 +00:00
Added comment and uncomment selection
This commit is contained in:
1 parent
fe91f317de
commit
ee37d8e8d3
20 files changed
+2177
-1845
No files matched your search
+18
-1
@@ -137,10 +137,17 @@ namespace ts.server.protocol {
|
||||
/* @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",
|
||||
ProvideCallHierarchyIncomingCalls = "provideCallHierarchyIncomingCalls",
|
||||
ProvideCallHierarchyOutgoingCalls = "provideCallHierarchyOutgoingCalls",
|
||||
@@ -1547,6 +1554,16 @@ namespace ts.server.protocol {
|
||||
arguments: FileRangeRequestArgs;
|
||||
}
|
||||
|
||||
export interface CommentSelectionRequest extends FileRequest {
|
||||
command: CommandTypes.CommentSelection;
|
||||
arguments: FileRangeRequestArgs;
|
||||
}
|
||||
|
||||
export interface UncommentSelectionRequest extends FileRequest {
|
||||
command: CommandTypes.UncommentSelection;
|
||||
arguments: FileRangeRequestArgs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Information found in an "open" request.
|
||||
*/
|
||||
|
||||
@@ -2233,6 +2233,38 @@ namespace ts.server {
|
||||
return textChanges;
|
||||
}
|
||||
|
||||
private commentSelection(args: protocol.FileRangeRequestArgs, simplifiedResult: boolean): TextChange[] | protocol.CodeEdit[] {
|
||||
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;
|
||||
}
|
||||
|
||||
private uncommentSelection(args: protocol.FileRangeRequestArgs, simplifiedResult: boolean): TextChange[] | protocol.CodeEdit[] {
|
||||
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;
|
||||
}
|
||||
|
||||
private mapSelectionRange(selectionRange: SelectionRange, scriptInfo: ScriptInfo): protocol.SelectionRange {
|
||||
const result: protocol.SelectionRange = {
|
||||
textSpan: toProtocolTextSpan(selectionRange.textSpan, scriptInfo),
|
||||
@@ -2690,6 +2722,18 @@ namespace ts.server {
|
||||
[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.CommentSelectionFull]: (request: protocol.CommentSelectionRequest) => {
|
||||
return this.requiredResponse(this.commentSelection(request.arguments, /*simplifiedResult*/false));
|
||||
},
|
||||
[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));
|
||||
},
|
||||
});
|
||||
|
||||
public addProtocolHandler(command: string, handler: (request: protocol.Request) => HandlerResponse) {
|
||||
|
||||
Reference in new issue
Block a user