Merge branch 'main' into CohostDocumentHandling

Author: davidwengier

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.77.x
+* Bump xamlTools to 17.14.36106.43 (PR: [#8260](https://github.com/dotnet/vscode-csharp/pull/8260))
 * Bump Razor to 10.0.0-preview.25256.6 (PR: [#8259](https://github.com/dotnet/vscode-csharp/pull/8259))
   * Improve document handling in VS Code and cohosting (#11825) (PR: [#11825](https://github.com/dotnet/razor/pull/11825))
   * Use new select and order method (#11826) (PR: [#11826](https://github.com/dotnet/razor/pull/11826))

package.json

@@ -44,7 +44,7 @@
     "omniSharp": "1.39.12",
     "razor": "10.0.0-preview.25256.6",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.36010.33"
+    "xamlTools": "17.14.36106.43"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",

src/lsptoolshost/copilot/contextProviders.ts

@@ -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;
@@ -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
 );
 
@@ -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;
 }
@@ -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`);
+                        break;
+                    }
                 }
             }
 
-            if (!hasCapabilities) {
+            if (!resolveMethod) {
                 channel.debug(
                     `Failed to find compatible version of context provider from installed version of ${csharpDevkitExtensionId}.`
                 );
@@ -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;
                         },