Skip to content

Support new context resolve handler #8126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 7, 2025
Merged

Support new context resolve handler #8126

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1543999
Pass activeExperiments to context providers
genlu Apr 2, 2025
1a58310
Support new context resolve handler
genlu Apr 3, 2025
1f0e48a
Merge remote-tracking branch 'dotnet/main' into activeExps
genlu Apr 24, 2025
74b07bd
Upgrade roslyn
genlu Apr 24, 2025
4cd4db2
Merge remote-tracking branch 'dotnet/main' into activeExps
genlu May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 35 additions & 20 deletions src/lsptoolshost/copilot/contextProviders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export const copilotLanguageServerExtensionComponentName = '@microsoft/visualstu
export const copilotLanguageServerExtensionAssemblyName = 'Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll';
const copilotLanguageServerExtensionCapabilitiesFileName = 'capabilities.json';

type ActiveExperiments = { [name: string]: string | number | boolean | string[] };

export interface DocumentContext {
textDocument: lsp.TextDocumentIdentifier;
position: lsp.Position;
Expand All @@ -25,12 +27,19 @@ export interface ContextResolveParam {
completionId: string;
timeBudget: number;
data?: any;
activeExperiments: ActiveExperiments;
}

const resolveContextMethodName = 'roslyn/resolveContext';
const resolveContextMethodSupportedVersion = '1';
const resolveContextRequest = new lsp.RequestType<ContextResolveParam, SupportedContextItem[], void>(
resolveContextMethodName,
const oldResolveContextMethodName = 'roslyn/resolveContext';
const oldresolveContextMethodSupportedVersion = '1';
const newResolveContextMethodName = 'roslyn/resolveContext@2';
const newResolveContextMethodSupportedVersion = '1';
const oldResolveContextRequest = new lsp.RequestType<ContextResolveParam, SupportedContextItem[], void>(
oldResolveContextMethodName,
lsp.ParameterStructures.auto
);
const newResolveContextRequest = new lsp.RequestType<ContextResolveParam, SupportedContextItem[], void>(
newResolveContextMethodName,
lsp.ParameterStructures.auto
);

Expand Down Expand Up @@ -60,6 +69,8 @@ function createContextResolveParam(request: ResolveRequest): ContextResolveParam
},
completionId: request.completionId,
timeBudget: request.timeBudget,
data: request.data,
activeExperiments: Object.fromEntries(request.activeExperiments),
};
return contextResolveParam;
}
Expand All @@ -76,27 +87,35 @@ export function registerCopilotContextProviders(

devkit.activate().then(async (devKitExports) => {
try {
// Check if the Copilot Language Server extension is installed and has the correct capabilities
let hasCapabilities = false;
let resolveMethod: lsp.RequestType<ContextResolveParam, SupportedContextItem[], void> | undefined =
undefined;
const copilotServerExtensionfolder = devKitExports.components[copilotLanguageServerExtensionComponentName];
if (copilotServerExtensionfolder) {
const capabilitiesFilePath = path.join(
copilotServerExtensionfolder,
copilotLanguageServerExtensionCapabilitiesFileName
);
const capabilitiesContent = await readJsonSync(capabilitiesFilePath);
if (
capabilitiesContent?.capabilities?.find(
(capability: any) =>
capability?.method === resolveContextMethodName &&
capability?.version === resolveContextMethodSupportedVersion
)
) {
hasCapabilities = true;
for (const capability of capabilitiesContent?.capabilities ?? []) {
if (
capability.method === oldResolveContextMethodName &&
capability.version === oldresolveContextMethodSupportedVersion
) {
resolveMethod = oldResolveContextRequest;
channel.debug(`supported 'roslyn/resolveContext' method found in capabilities.json`);
break;
} else if (
capability.method === newResolveContextMethodName &&
capability.version === newResolveContextMethodSupportedVersion
) {
resolveMethod = newResolveContextRequest;
channel.debug(`supported 'roslyn/resolveContext@2' method found in capabilities.json`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to make a note here - this PR requires a Roslyn version bump with the handler present in it (otherwise this request may fail).

break;
}
}
}

if (!hasCapabilities) {
if (!resolveMethod) {
channel.debug(
`Failed to find compatible version of context provider from installed version of ${csharpDevkitExtensionId}.`
);
Expand Down Expand Up @@ -131,11 +150,7 @@ export function registerCopilotContextProviders(
if (!contextResolveParam) {
return [];
}
const items = await languageServer.sendRequest(
resolveContextRequest,
contextResolveParam,
token
);
const items = await languageServer.sendRequest(resolveMethod, contextResolveParam, token);
channel.trace(`Copilot context provider resolved ${items.length} items`);
return items;
},
Expand Down