Skip to content

Commit 79ea5a5

Browse files
authored
Stub out copilotRelated command (#60488)
1 parent b58ac4a commit 79ea5a5

17 files changed

+5
-290
lines changed

src/harness/client.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,6 @@ export class SessionClient implements LanguageService {
801801
}
802802

803803
mapCode: typeof notImplemented = notImplemented;
804-
getImports: typeof notImplemented = notImplemented;
805804

806805
private createFileLocationOrRangeRequestArgs(positionOrRange: number | TextRange, fileName: string): protocol.FileLocationOrRangeRequestArgs {
807806
return typeof positionOrRange === "number"

src/harness/fourslashImpl.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4652,28 +4652,6 @@ ${changes.join("\n// ---\n")}
46524652
${after}`;
46534653
this.baseline("mapCode", baseline, ".mapCode.ts");
46544654
}
4655-
4656-
public verifyGetImports(fileName: string, expectedImports: string[]): void {
4657-
const actualImports = this.languageService.getImports(fileName);
4658-
if (actualImports.length !== expectedImports.length) {
4659-
throw new Error(`Expected ${expectedImports.length} imports for ${fileName}, got ${actualImports.length}
4660-
Expected:
4661-
${expectedImports}
4662-
Actual:
4663-
${actualImports}
4664-
`);
4665-
}
4666-
for (let i = 0; i < expectedImports.length; i++) {
4667-
if (actualImports[i] !== expectedImports[i]) {
4668-
throw new Error(`Expected at ${fileName} index ${i}: ${expectedImports[i]}, got ${actualImports[i]}
4669-
Expected:
4670-
${expectedImports}
4671-
Actual:
4672-
${actualImports}
4673-
`);
4674-
}
4675-
}
4676-
}
46774655
}
46784656

46794657
function updateTextRangeForTextChanges({ pos, end }: ts.TextRange, textChanges: readonly ts.TextChange[]): ts.TextRange {

src/harness/fourslashInterfaceImpl.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,6 @@ export class VerifyNegatable {
257257
public baselineMapCode(ranges: FourSlash.Range[][], changes: string[] = []): void {
258258
this.state.baselineMapCode(ranges, changes);
259259
}
260-
261-
public getImports(fileName: string, imports: string[]): void {
262-
return this.state.verifyGetImports(fileName, imports);
263-
}
264260
}
265261

266262
export interface CompletionsResult {
@@ -2051,8 +2047,3 @@ export interface RenameOptions {
20512047
readonly providePrefixAndSuffixTextForRename?: boolean;
20522048
readonly quotePreference?: "auto" | "double" | "single";
20532049
}
2054-
2055-
export interface VerifyGetImportsOptions {
2056-
fileName: string;
2057-
imports: string[];
2058-
}

src/server/protocol.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ export const enum CommandTypes {
202202
ProvideInlayHints = "provideInlayHints",
203203
WatchChange = "watchChange",
204204
MapCode = "mapCode",
205+
/** @internal */
205206
CopilotRelated = "copilotRelated",
206207
}
207208

@@ -2417,18 +2418,6 @@ export interface MapCodeResponse extends Response {
24172418
body: readonly FileCodeEdits[];
24182419
}
24192420

2420-
export interface CopilotRelatedRequest extends FileRequest {
2421-
command: CommandTypes.CopilotRelated;
2422-
arguments: FileRequestArgs;
2423-
}
2424-
2425-
export interface CopilotRelatedItems {
2426-
relatedFiles: readonly string[];
2427-
}
2428-
2429-
export interface CopilotRelatedResponse extends Response {
2430-
body: CopilotRelatedItems;
2431-
}
24322421
/**
24332422
* Synchronous request for semantic diagnostics of one file.
24342423
*/

src/server/session.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,11 +2052,9 @@ export class Session<TMessage = string> implements EventSender {
20522052
return this.mapTextChangesToCodeEdits(changes);
20532053
}
20542054

2055-
private getCopilotRelatedInfo(args: protocol.FileRequestArgs): protocol.CopilotRelatedItems {
2056-
const { file, project } = this.getFileAndProject(args);
2057-
2055+
private getCopilotRelatedInfo(): { relatedFiles: never[]; } {
20582056
return {
2059-
relatedFiles: project.getLanguageService().getImports(file),
2057+
relatedFiles: [],
20602058
};
20612059
}
20622060

@@ -3802,8 +3800,8 @@ export class Session<TMessage = string> implements EventSender {
38023800
[protocol.CommandTypes.MapCode]: (request: protocol.MapCodeRequest) => {
38033801
return this.requiredResponse(this.mapCode(request.arguments));
38043802
},
3805-
[protocol.CommandTypes.CopilotRelated]: (request: protocol.CopilotRelatedRequest) => {
3806-
return this.requiredResponse(this.getCopilotRelatedInfo(request.arguments));
3803+
[protocol.CommandTypes.CopilotRelated]: () => {
3804+
return this.requiredResponse(this.getCopilotRelatedInfo());
38073805
},
38083806
}));
38093807

src/services/services.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {
22
__String,
33
ApplicableRefactorInfo,
44
ApplyCodeActionCommandResult,
5-
arrayFrom,
65
AssignmentDeclarationKind,
76
BaseType,
87
BinaryExpression,
@@ -234,7 +233,6 @@ import {
234233
Node,
235234
NodeArray,
236235
NodeFlags,
237-
nodeIsSynthesized,
238236
noop,
239237
normalizePath,
240238
normalizeSpans,
@@ -1604,7 +1602,6 @@ const invalidOperationsInPartialSemanticMode: readonly (keyof LanguageService)[]
16041602
"provideInlayHints",
16051603
"getSupportedCodeFixes",
16061604
"getPasteEdits",
1607-
"getImports",
16081605
];
16091606

16101607
const invalidOperationsInSyntacticMode: readonly (keyof LanguageService)[] = [
@@ -3381,18 +3378,6 @@ export function createLanguageService(
33813378
);
33823379
}
33833380

3384-
function getImports(fileName: string): readonly string[] {
3385-
synchronizeHostData();
3386-
const file = getValidSourceFile(fileName);
3387-
let imports: Set<string> | undefined;
3388-
for (const specifier of file.imports) {
3389-
if (nodeIsSynthesized(specifier)) continue;
3390-
const name = program.getResolvedModuleFromModuleSpecifier(specifier, file)?.resolvedModule?.resolvedFileName;
3391-
if (name) (imports ??= new Set()).add(name);
3392-
}
3393-
return imports ? arrayFrom(imports) : emptyArray;
3394-
}
3395-
33963381
const ls: LanguageService = {
33973382
dispose,
33983383
cleanupSemanticCache,
@@ -3467,7 +3452,6 @@ export function createLanguageService(
34673452
preparePasteEditsForFile,
34683453
getPasteEdits,
34693454
mapCode,
3470-
getImports,
34713455
};
34723456

34733457
switch (languageServiceMode) {

src/services/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ export interface LanguageService {
699699
getSupportedCodeFixes(fileName?: string): readonly string[];
700700

701701
/** @internal */ mapCode(fileName: string, contents: string[], focusLocations: TextSpan[][] | undefined, formatOptions: FormatCodeSettings, preferences: UserPreferences): readonly FileTextChanges[];
702-
/** @internal */ getImports(fileName: string): readonly string[];
703702

704703
dispose(): void;
705704
preparePasteEditsForFile(fileName: string, copiedTextRanges: TextRange[]): boolean;

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ declare namespace ts {
123123
ProvideInlayHints = "provideInlayHints",
124124
WatchChange = "watchChange",
125125
MapCode = "mapCode",
126-
CopilotRelated = "copilotRelated",
127126
}
128127
/**
129128
* A TypeScript Server message
@@ -1839,16 +1838,6 @@ declare namespace ts {
18391838
export interface MapCodeResponse extends Response {
18401839
body: readonly FileCodeEdits[];
18411840
}
1842-
export interface CopilotRelatedRequest extends FileRequest {
1843-
command: CommandTypes.CopilotRelated;
1844-
arguments: FileRequestArgs;
1845-
}
1846-
export interface CopilotRelatedItems {
1847-
relatedFiles: readonly string[];
1848-
}
1849-
export interface CopilotRelatedResponse extends Response {
1850-
body: CopilotRelatedItems;
1851-
}
18521841
/**
18531842
* Synchronous request for semantic diagnostics of one file.
18541843
*/

tests/cases/fourslash/fourslash.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,6 @@ declare namespace FourSlashInterface {
472472
}
473473
}): void;
474474
baselineMapCode(ranges: Range[][], changes: string[]): void;
475-
getImports(fileName: string, imports: string[]): void;
476475
}
477476
class edit {
478477
caretPosition(): Marker;

tests/cases/fourslash/getImportsDuplicate.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

tests/cases/fourslash/getImportsDynamic.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/cases/fourslash/getImportsJSXFactory.ts

Lines changed: 0 additions & 108 deletions
This file was deleted.

tests/cases/fourslash/getImportsNone.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/cases/fourslash/getImportsOne.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/cases/fourslash/getImportsOneJs.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/cases/fourslash/getImportsReexport.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)