Skip to content

Commit ebbc56d

Browse files
authored
Derive allCommandNames from CommandTypes enum (#52319)
1 parent 6f338b9 commit ebbc56d

File tree

3 files changed

+2
-101
lines changed

3 files changed

+2
-101
lines changed

src/server/protocol.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ import {
1919
TypeAcquisition,
2020
} from "./_namespaces/ts";
2121

22-
/**
23-
* Declaration module describing the TypeScript Server protocol
24-
*/
22+
// Declaration module describing the TypeScript Server protocol
2523

26-
// NOTE: If updating this, be sure to also update `allCommandNames` in `testRunner/unittests/tsserver/session.ts`.
2724
export const enum CommandTypes {
2825
JsxClosingTag = "jsxClosingTag",
2926
Brace = "brace",
@@ -175,8 +172,6 @@ export const enum CommandTypes {
175172
ProvideCallHierarchyIncomingCalls = "provideCallHierarchyIncomingCalls",
176173
ProvideCallHierarchyOutgoingCalls = "provideCallHierarchyOutgoingCalls",
177174
ProvideInlayHints = "provideInlayHints"
178-
179-
// NOTE: If updating this, be sure to also update `allCommandNames` in `testRunner/unittests/tsserver/session.ts`.
180175
}
181176

182177
/**

src/testRunner/unittests/tsserver/session.ts

Lines changed: 1 addition & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -195,98 +195,7 @@ describe("unittests:: tsserver:: Session:: General functionality", () => {
195195
});
196196

197197
describe("onMessage", () => {
198-
const allCommandNames: ts.server.protocol.CommandTypes[] = [
199-
ts.server.protocol.CommandTypes.Brace,
200-
ts.server.protocol.CommandTypes.BraceFull,
201-
ts.server.protocol.CommandTypes.BraceCompletion,
202-
ts.server.protocol.CommandTypes.Change,
203-
ts.server.protocol.CommandTypes.Close,
204-
ts.server.protocol.CommandTypes.Completions,
205-
ts.server.protocol.CommandTypes.CompletionsFull,
206-
ts.server.protocol.CommandTypes.CompletionDetails,
207-
ts.server.protocol.CommandTypes.CompileOnSaveAffectedFileList,
208-
ts.server.protocol.CommandTypes.Configure,
209-
ts.server.protocol.CommandTypes.Definition,
210-
ts.server.protocol.CommandTypes.DefinitionFull,
211-
ts.server.protocol.CommandTypes.DefinitionAndBoundSpan,
212-
ts.server.protocol.CommandTypes.DefinitionAndBoundSpanFull,
213-
ts.server.protocol.CommandTypes.Implementation,
214-
ts.server.protocol.CommandTypes.ImplementationFull,
215-
ts.server.protocol.CommandTypes.Exit,
216-
ts.server.protocol.CommandTypes.FileReferences,
217-
ts.server.protocol.CommandTypes.FileReferencesFull,
218-
ts.server.protocol.CommandTypes.Format,
219-
ts.server.protocol.CommandTypes.Formatonkey,
220-
ts.server.protocol.CommandTypes.FormatFull,
221-
ts.server.protocol.CommandTypes.FormatonkeyFull,
222-
ts.server.protocol.CommandTypes.FormatRangeFull,
223-
ts.server.protocol.CommandTypes.Geterr,
224-
ts.server.protocol.CommandTypes.GeterrForProject,
225-
ts.server.protocol.CommandTypes.SemanticDiagnosticsSync,
226-
ts.server.protocol.CommandTypes.SyntacticDiagnosticsSync,
227-
ts.server.protocol.CommandTypes.SuggestionDiagnosticsSync,
228-
ts.server.protocol.CommandTypes.NavBar,
229-
ts.server.protocol.CommandTypes.NavBarFull,
230-
ts.server.protocol.CommandTypes.Navto,
231-
ts.server.protocol.CommandTypes.NavtoFull,
232-
ts.server.protocol.CommandTypes.NavTree,
233-
ts.server.protocol.CommandTypes.NavTreeFull,
234-
ts.server.protocol.CommandTypes.Occurrences,
235-
ts.server.protocol.CommandTypes.DocumentHighlights,
236-
ts.server.protocol.CommandTypes.DocumentHighlightsFull,
237-
ts.server.protocol.CommandTypes.JsxClosingTag,
238-
ts.server.protocol.CommandTypes.Open,
239-
ts.server.protocol.CommandTypes.Quickinfo,
240-
ts.server.protocol.CommandTypes.QuickinfoFull,
241-
ts.server.protocol.CommandTypes.References,
242-
ts.server.protocol.CommandTypes.ReferencesFull,
243-
ts.server.protocol.CommandTypes.Reload,
244-
ts.server.protocol.CommandTypes.Rename,
245-
ts.server.protocol.CommandTypes.RenameInfoFull,
246-
ts.server.protocol.CommandTypes.RenameLocationsFull,
247-
ts.server.protocol.CommandTypes.Saveto,
248-
ts.server.protocol.CommandTypes.SignatureHelp,
249-
ts.server.protocol.CommandTypes.SignatureHelpFull,
250-
ts.server.protocol.CommandTypes.Status,
251-
ts.server.protocol.CommandTypes.TypeDefinition,
252-
ts.server.protocol.CommandTypes.ProjectInfo,
253-
ts.server.protocol.CommandTypes.ReloadProjects,
254-
ts.server.protocol.CommandTypes.Unknown,
255-
ts.server.protocol.CommandTypes.OpenExternalProject,
256-
ts.server.protocol.CommandTypes.CloseExternalProject,
257-
ts.server.protocol.CommandTypes.SynchronizeProjectList,
258-
ts.server.protocol.CommandTypes.ApplyChangedToOpenFiles,
259-
ts.server.protocol.CommandTypes.EncodedSemanticClassificationsFull,
260-
ts.server.protocol.CommandTypes.Cleanup,
261-
ts.server.protocol.CommandTypes.GetOutliningSpans,
262-
ts.server.protocol.CommandTypes.GetOutliningSpansFull,
263-
ts.server.protocol.CommandTypes.TodoComments,
264-
ts.server.protocol.CommandTypes.Indentation,
265-
ts.server.protocol.CommandTypes.DocCommentTemplate,
266-
ts.server.protocol.CommandTypes.CompilerOptionsDiagnosticsFull,
267-
ts.server.protocol.CommandTypes.NameOrDottedNameSpan,
268-
ts.server.protocol.CommandTypes.BreakpointStatement,
269-
ts.server.protocol.CommandTypes.CompilerOptionsForInferredProjects,
270-
ts.server.protocol.CommandTypes.GetCodeFixes,
271-
ts.server.protocol.CommandTypes.GetCodeFixesFull,
272-
ts.server.protocol.CommandTypes.GetSupportedCodeFixes,
273-
ts.server.protocol.CommandTypes.GetApplicableRefactors,
274-
ts.server.protocol.CommandTypes.GetEditsForRefactor,
275-
ts.server.protocol.CommandTypes.GetEditsForRefactorFull,
276-
ts.server.protocol.CommandTypes.OrganizeImports,
277-
ts.server.protocol.CommandTypes.OrganizeImportsFull,
278-
ts.server.protocol.CommandTypes.GetEditsForFileRename,
279-
ts.server.protocol.CommandTypes.GetEditsForFileRenameFull,
280-
ts.server.protocol.CommandTypes.SelectionRange,
281-
ts.server.protocol.CommandTypes.PrepareCallHierarchy,
282-
ts.server.protocol.CommandTypes.ProvideCallHierarchyIncomingCalls,
283-
ts.server.protocol.CommandTypes.ProvideCallHierarchyOutgoingCalls,
284-
ts.server.protocol.CommandTypes.ToggleLineComment,
285-
ts.server.protocol.CommandTypes.ToggleMultilineComment,
286-
ts.server.protocol.CommandTypes.CommentSelection,
287-
ts.server.protocol.CommandTypes.UncommentSelection,
288-
ts.server.protocol.CommandTypes.ProvideInlayHints
289-
];
198+
const allCommandNames: ts.server.protocol.CommandTypes[] = Object.values((ts.server.protocol as any).CommandTypes);
290199

291200
it("should not throw when commands are executed with invalid arguments", () => {
292201
let i = 0;

tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ declare namespace ts {
8787
readonly kind: ActionSet;
8888
}
8989
namespace protocol {
90-
/**
91-
* Declaration module describing the TypeScript Server protocol
92-
*/
9390
enum CommandTypes {
9491
JsxClosingTag = "jsxClosingTag",
9592
Brace = "brace",

0 commit comments

Comments
 (0)