Skip to content

Commit 391433a

Browse files
committed
code snippet provider
1 parent 4c6f319 commit 391433a

File tree

8 files changed

+1164
-727
lines changed

8 files changed

+1164
-727
lines changed

Extension/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6589,6 +6589,7 @@
65896589
"xml2js": "^0.6.2"
65906590
},
65916591
"dependencies": {
6592+
"@github/copilot-language-server": "^1.253.0",
65926593
"@vscode/extension-telemetry": "^0.9.6",
65936594
"chokidar": "^3.6.0",
65946595
"comment-json": "^4.2.3",

Extension/src/LanguageServer/client.ts

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ import {
5454
} from './codeAnalysis';
5555
import { Location, TextEdit, WorkspaceEdit } from './commonTypes';
5656
import * as configs from './configurations';
57+
import { CopilotCompletionContextProvider } from './copilotCompletionContextProvider';
5758
import { DataBinding } from './dataBinding';
5859
import { cachedEditorConfigSettings, getEditorConfigSettings } from './editorConfig';
59-
import { CppSourceStr, clients, configPrefix, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
60+
import { CppSourceStr, SnippetEntry, clients, configPrefix, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
6061
import { LocalizeStringParams, getLocaleId, getLocalizedString } from './localization';
6162
import { PersistentFolderState, PersistentState, PersistentWorkspaceState } from './persistentState';
6263
import { RequestCancelled, ServerCancelled, createProtocolFilter } from './protocolFilter';
@@ -183,6 +184,7 @@ interface TelemetryPayload {
183184
event: string;
184185
properties?: Record<string, string>;
185186
metrics?: Record<string, number>;
187+
signedMetrics?: Record<string, number>;
186188
}
187189

188190
interface ReportStatusNotificationBody extends WorkspaceFolderParams {
@@ -575,6 +577,18 @@ interface FilesEncodingChanged {
575577
foldersFilesEncoding: FolderFilesEncodingChanged[];
576578
}
577579

580+
export interface CopilotCompletionContextResult {
581+
isResultMissing: boolean;
582+
snippets: SnippetEntry[];
583+
translationUnitUri: string;
584+
caretOffset: number;
585+
}
586+
587+
export interface CopilotCompletionContextParams {
588+
uri: string;
589+
caretOffset: number;
590+
}
591+
578592
// Requests
579593
const PreInitializationRequest: RequestType<void, string, void> = new RequestType<void, string, void>('cpptools/preinitialize');
580594
const InitializationRequest: RequestType<CppInitializationParams, void, void> = new RequestType<CppInitializationParams, void, void>('cpptools/initialize');
@@ -597,6 +611,7 @@ const ChangeCppPropertiesRequest: RequestType<CppPropertiesParams, void, void> =
597611
const IncludesRequest: RequestType<GetIncludesParams, GetIncludesResult, void> = new RequestType<GetIncludesParams, GetIncludesResult, void>('cpptools/getIncludes');
598612
const CppContextRequest: RequestType<TextDocumentIdentifier, ChatContextResult, void> = new RequestType<TextDocumentIdentifier, ChatContextResult, void>('cpptools/getChatContext');
599613
const ProjectContextRequest: RequestType<TextDocumentIdentifier, ProjectContextResult, void> = new RequestType<TextDocumentIdentifier, ProjectContextResult, void>('cpptools/getProjectContext');
614+
const CopilotCompletionContextRequest: RequestType<CopilotCompletionContextParams, CopilotCompletionContextResult, void> = new RequestType<CopilotCompletionContextParams, CopilotCompletionContextResult, void>('cpptools/getCompletionContext');
600615

601616
// Notifications to the server
602617
const DidOpenNotification: NotificationType<DidOpenTextDocumentParams> = new NotificationType<DidOpenTextDocumentParams>('textDocument/didOpen');
@@ -832,6 +847,7 @@ export interface Client {
832847
getChatContext(uri: vscode.Uri, token: vscode.CancellationToken): Promise<ChatContextResult>;
833848
getProjectContext(uri: vscode.Uri): Promise<ProjectContextResult>;
834849
filesEncodingChanged(filesEncodingChanged: FilesEncodingChanged): void;
850+
getCompletionContext(fileName: vscode.Uri, caretOffset: number, token: vscode.CancellationToken): Promise<CopilotCompletionContextResult>;
835851
}
836852

837853
export function createClient(workspaceFolder?: vscode.WorkspaceFolder): Client {
@@ -866,6 +882,7 @@ export class DefaultClient implements Client {
866882
private configurationProvider?: string;
867883
private hoverProvider: HoverProvider | undefined;
868884
private copilotHoverProvider: CopilotHoverProvider | undefined;
885+
private copilotCompletionProvider?: CopilotCompletionContextProvider;
869886

870887
public lastCustomBrowseConfiguration: PersistentFolderState<WorkspaceBrowseConfiguration | undefined> | undefined;
871888
public lastCustomBrowseConfigurationProviderId: PersistentFolderState<string | undefined> | undefined;
@@ -1342,6 +1359,9 @@ export class DefaultClient implements Client {
13421359
this.semanticTokensProviderDisposable = vscode.languages.registerDocumentSemanticTokensProvider(util.documentSelector, this.semanticTokensProvider, semanticTokensLegend);
13431360
}
13441361

1362+
this.copilotCompletionProvider = await CopilotCompletionContextProvider.Create();
1363+
this.disposables.push(this.copilotCompletionProvider);
1364+
13451365
// Listen for messages from the language server.
13461366
this.registerNotifications();
13471367

@@ -1873,6 +1893,7 @@ export class DefaultClient implements Client {
18731893
if (diagnosticsCollectionIntelliSense) {
18741894
diagnosticsCollectionIntelliSense.delete(document.uri);
18751895
}
1896+
this.copilotCompletionProvider?.removeFile(uri);
18761897
openFileVersions.delete(uri);
18771898
}
18781899

@@ -2252,7 +2273,6 @@ export class DefaultClient implements Client {
22522273
return util.extractCompilerPathAndArgs(!!settings.legacyCompilerArgsBehavior,
22532274
this.configuration.CurrentConfiguration?.compilerPath,
22542275
this.configuration.CurrentConfiguration?.compilerArgs);
2255-
22562276
}
22572277

22582278
public async getVcpkgInstalled(): Promise<boolean> {
@@ -2321,6 +2341,12 @@ export class DefaultClient implements Client {
23212341
() => this.languageClient.sendRequest(CppContextRequest, params, token), token);
23222342
}
23232343

2344+
public async getCompletionContext(file: vscode.Uri, caretOffset: number, token: vscode.CancellationToken): Promise<CopilotCompletionContextResult> {
2345+
await withCancellation(this.ready, token);
2346+
return DefaultClient.withLspCancellationHandling(
2347+
() => this.languageClient.sendRequest(CopilotCompletionContextRequest, { uri: file.toString(), caretOffset }, token), token);
2348+
}
2349+
23242350
/**
23252351
* a Promise that can be awaited to know when it's ok to proceed.
23262352
*
@@ -2693,7 +2719,8 @@ export class DefaultClient implements Client {
26932719
if (notificationBody.event === "includeSquiggles" && this.configurationProvider && notificationBody.properties) {
26942720
notificationBody.properties["providerId"] = this.configurationProvider;
26952721
}
2696-
telemetry.logLanguageServerEvent(notificationBody.event, notificationBody.properties, notificationBody.metrics);
2722+
const metrics_unified: Record<string, number> = { ...notificationBody.metrics, ...notificationBody.signedMetrics };
2723+
telemetry.logLanguageServerEvent(notificationBody.event, notificationBody.properties, metrics_unified);
26972724
}
26982725

26992726
private async updateStatus(notificationBody: ReportStatusNotificationBody): Promise<void> {
@@ -4249,4 +4276,5 @@ class NullClient implements Client {
42494276
getChatContext(uri: vscode.Uri, token: vscode.CancellationToken): Promise<ChatContextResult> { return Promise.resolve({} as ChatContextResult); }
42504277
getProjectContext(uri: vscode.Uri): Promise<ProjectContextResult> { return Promise.resolve({} as ProjectContextResult); }
42514278
filesEncodingChanged(filesEncodingChanged: FilesEncodingChanged): void { }
4279+
getCompletionContext(file: vscode.Uri, caretOffset: number, token: vscode.CancellationToken): Promise<CopilotCompletionContextResult> { return Promise.resolve({} as CopilotCompletionContextResult); }
42524280
}

0 commit comments

Comments
 (0)