Skip to content

Commit 61ca65f

Browse files
committed
Fixed #3887 tsserver drops responses
1 parent 01244d6 commit 61ca65f

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/server/session.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -842,53 +842,53 @@ namespace ts.server {
842842
private handlers : Map<(request: protocol.Request) => {response?: any, responseRequired?: boolean}> = {
843843
[CommandNames.Exit]: () => {
844844
this.exit();
845-
return {};
845+
return { responseRequired: false};
846846
},
847847
[CommandNames.Definition]: (request: protocol.Request) => {
848848
var defArgs = <protocol.FileLocationRequestArgs>request.arguments;
849-
return {response: this.getDefinition(defArgs.line, defArgs.offset, defArgs.file)};
849+
return {response: this.getDefinition(defArgs.line, defArgs.offset, defArgs.file), responseRequired: true};
850850
},
851851
[CommandNames.TypeDefinition]: (request: protocol.Request) => {
852852
var defArgs = <protocol.FileLocationRequestArgs>request.arguments;
853-
return {response: this.getTypeDefinition(defArgs.line, defArgs.offset, defArgs.file)};
853+
return {response: this.getTypeDefinition(defArgs.line, defArgs.offset, defArgs.file), responseRequired: true};
854854
},
855855
[CommandNames.References]: (request: protocol.Request) => {
856856
var defArgs = <protocol.FileLocationRequestArgs>request.arguments;
857-
return {response: this.getReferences(defArgs.line, defArgs.offset, defArgs.file)};
857+
return {response: this.getReferences(defArgs.line, defArgs.offset, defArgs.file), responseRequired: true};
858858
},
859859
[CommandNames.Rename]: (request: protocol.Request) => {
860860
var renameArgs = <protocol.RenameRequestArgs>request.arguments;
861-
return {response: this.getRenameLocations(renameArgs.line, renameArgs.offset, renameArgs.file, renameArgs.findInComments, renameArgs.findInStrings)}
861+
return {response: this.getRenameLocations(renameArgs.line, renameArgs.offset, renameArgs.file, renameArgs.findInComments, renameArgs.findInStrings), responseRequired: true}
862862
},
863863
[CommandNames.Open]: (request: protocol.Request) => {
864864
var openArgs = <protocol.OpenRequestArgs>request.arguments;
865865
this.openClientFile(openArgs.file);
866-
return {}
866+
return {responseRequired: false}
867867
},
868868
[CommandNames.Quickinfo]: (request: protocol.Request) => {
869869
var quickinfoArgs = <protocol.FileLocationRequestArgs>request.arguments;
870-
return {response: this.getQuickInfo(quickinfoArgs.line, quickinfoArgs.offset, quickinfoArgs.file)};
870+
return {response: this.getQuickInfo(quickinfoArgs.line, quickinfoArgs.offset, quickinfoArgs.file), responseRequired: true};
871871
},
872872
[CommandNames.Format]: (request: protocol.Request) => {
873873
var formatArgs = <protocol.FormatRequestArgs>request.arguments;
874-
return {response: this.getFormattingEditsForRange(formatArgs.line, formatArgs.offset, formatArgs.endLine, formatArgs.endOffset, formatArgs.file)};
874+
return {response: this.getFormattingEditsForRange(formatArgs.line, formatArgs.offset, formatArgs.endLine, formatArgs.endOffset, formatArgs.file), responseRequired: true};
875875
},
876876
[CommandNames.Formatonkey]: (request: protocol.Request) => {
877877
var formatOnKeyArgs = <protocol.FormatOnKeyRequestArgs>request.arguments;
878-
return {response: this.getFormattingEditsAfterKeystroke(formatOnKeyArgs.line, formatOnKeyArgs.offset, formatOnKeyArgs.key, formatOnKeyArgs.file)};
878+
return {response: this.getFormattingEditsAfterKeystroke(formatOnKeyArgs.line, formatOnKeyArgs.offset, formatOnKeyArgs.key, formatOnKeyArgs.file), responseRequired: true};
879879
},
880880
[CommandNames.Completions]: (request: protocol.Request) => {
881881
var completionsArgs = <protocol.CompletionsRequestArgs>request.arguments;
882-
return {response: this.getCompletions(completionsArgs.line, completionsArgs.offset, completionsArgs.prefix, completionsArgs.file)}
882+
return {response: this.getCompletions(completionsArgs.line, completionsArgs.offset, completionsArgs.prefix, completionsArgs.file), responseRequired: true}
883883
},
884884
[CommandNames.CompletionDetails]: (request: protocol.Request) => {
885885
var completionDetailsArgs = <protocol.CompletionDetailsRequestArgs>request.arguments;
886886
return {response: this.getCompletionEntryDetails(completionDetailsArgs.line,completionDetailsArgs.offset,
887-
completionDetailsArgs.entryNames,completionDetailsArgs.file)}
887+
completionDetailsArgs.entryNames,completionDetailsArgs.file), responseRequired: true}
888888
},
889889
[CommandNames.SignatureHelp]: (request: protocol.Request) => {
890890
var signatureHelpArgs = <protocol.SignatureHelpRequestArgs>request.arguments;
891-
return {response: this.getSignatureHelpItems(signatureHelpArgs.line, signatureHelpArgs.offset, signatureHelpArgs.file)}
891+
return {response: this.getSignatureHelpItems(signatureHelpArgs.line, signatureHelpArgs.offset, signatureHelpArgs.file), responseRequired: true}
892892
},
893893
[CommandNames.Geterr]: (request: protocol.Request) => {
894894
var geterrArgs = <protocol.GeterrRequestArgs>request.arguments;
@@ -923,23 +923,23 @@ namespace ts.server {
923923
},
924924
[CommandNames.Navto]: (request: protocol.Request) => {
925925
var navtoArgs = <protocol.NavtoRequestArgs>request.arguments;
926-
return {response: this.getNavigateToItems(navtoArgs.searchValue, navtoArgs.file, navtoArgs.maxResultCount)};
926+
return {response: this.getNavigateToItems(navtoArgs.searchValue, navtoArgs.file, navtoArgs.maxResultCount), responseRequired: true};
927927
},
928928
[CommandNames.Brace]: (request: protocol.Request) => {
929929
var braceArguments = <protocol.FileLocationRequestArgs>request.arguments;
930-
return {response: this.getBraceMatching(braceArguments.line, braceArguments.offset, braceArguments.file)};
930+
return {response: this.getBraceMatching(braceArguments.line, braceArguments.offset, braceArguments.file), responseRequired: true};
931931
},
932932
[CommandNames.NavBar]: (request: protocol.Request) => {
933933
var navBarArgs = <protocol.FileRequestArgs>request.arguments;
934-
return {response: this.getNavigationBarItems(navBarArgs.file)};
934+
return {response: this.getNavigationBarItems(navBarArgs.file), responseRequired: true};
935935
},
936936
[CommandNames.Occurrences]: (request: protocol.Request) => {
937937
var { line, offset, file: fileName } = <protocol.FileLocationRequestArgs>request.arguments;
938-
return {response: this.getOccurrences(line, offset, fileName)};
938+
return {response: this.getOccurrences(line, offset, fileName), responseRequired: true};
939939
},
940940
[CommandNames.ProjectInfo]: (request: protocol.Request) => {
941941
var { file, needFileNameList } = <protocol.ProjectInfoRequestArgs>request.arguments;
942-
return {response: this.getProjectInfo(file, needFileNameList)};
942+
return {response: this.getProjectInfo(file, needFileNameList), responseRequired: true};
943943
},
944944
};
945945
addProtocolHandler(command: string, handler: (request: protocol.Request) => {response?: any, responseRequired: boolean}) {

0 commit comments

Comments
 (0)