Merged PR 472954: Move to using IDotnetDebugConfigurationService

Move to using IDotnetDebugConfigurationService

This PR moves from calling ILaunchConfigurationService and IBuildService
to IDotnetDebugConfigurationService.

Author: WardenGnaw

src/lsptoolshost/debugger.ts

@@ -26,7 +26,7 @@ export function registerDebugger(context: vscode.ExtensionContext, languageServe
     context.subscriptions.push(disposable);
 
     // Register ConfigurationProvider
-    context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('dotnet', new DotnetConfigurationResolver(workspaceInformationProvider, platformInfo)));
+    context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('dotnet', new DotnetConfigurationResolver(workspaceInformationProvider)));
     context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('coreclr', new DotnetWorkspaceConfigurationProvider(workspaceInformationProvider, platformInfo, optionProvider, csharpOutputChannel)));
     context.subscriptions.push(vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) => generateAssets(workspaceInformationProvider, selectedIndex)));
 }

src/lsptoolshost/services/Descriptors.ts

@@ -18,25 +18,8 @@ export default class Descriptors {
         ),
     );
 
-    /**
-     * The descriptor for the Project System launch configuration service.
-     * Use {@link ILaunchConfigurationService} for the RPC interface.
-     */
-    static readonly launchConfigurationService = new ServiceJsonRpcDescriptor(
-        ServiceMoniker.create('Microsoft.VisualStudio.LaunchConfigurationService', undefined),
-        Formatters.Utf8,
-        MessageDelimiters.HttpLikeHeaders,
-        {
-            protocolMajorVersion: 3
-        }
-    );
-
-    /**
-     * The descriptor for the Build service.
-     * Use {@link IBuildService} for the RPC interface.
-     */
-    static readonly buildService = new ServiceJsonRpcDescriptor(
-        ServiceMoniker.create('Microsoft.VisualStudio.BuildService', '0.1'),
+    static readonly dotnetDebugConfigurationService: ServiceRpcDescriptor = new ServiceJsonRpcDescriptor(
+        ServiceMoniker.create('Microsoft.VisualStudio.Debugger.DotnetDebugConfigurationService', '0.1'),
         Formatters.MessagePack, MessageDelimiters.BigEndianInt32LengthHeader,
         {
             protocolMajorVersion: 3

src/lsptoolshost/services/IBuildService.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+export enum DotnetDebugConfigurationServiceErrorKind {
+    internalError = 'internalError',
+    launchCancelled = 'launchCancelled',
+    userError = 'userError',
+}
+
+export interface IDotnetDebugConfigurationServiceError {
+    kind: DotnetDebugConfigurationServiceErrorKind;
+    message?: string | undefined;
+}
+
+export interface IDotnetDebugConfigurationServiceResult {
+    configurations: vscode.DebugConfiguration[];
+    error?: IDotnetDebugConfigurationServiceError | undefined;
+}
+
+export interface IDotnetDebugConfigurationService {
+    resolveDebugConfigurationWithLaunchConfigurationService(
+        projectPath: string,
+        debugConfiguration: vscode.DebugConfiguration,
+        token?: vscode.CancellationToken,
+    ): Promise<IDotnetDebugConfigurationServiceResult>;
+}

src/lsptoolshost/services/IDotnetDebugConfigurationService.ts

@@ -20,8 +20,7 @@ export function getBrokeredServiceContainer(): CSharpExtensionServiceBroker {
         // Register any brokered services that come from other extensions so that we can proffer them later.
 
         _csharpExtensionServiceBroker.registerExternalServices(
-            Descriptors.launchConfigurationService.moniker,
-            Descriptors.buildService.moniker
+            Descriptors.dotnetDebugConfigurationService.moniker
         );
     }
     return _csharpExtensionServiceBroker;

src/lsptoolshost/services/ILaunchConfigurationService.ts

@@ -280,8 +280,7 @@ function tryGetCSharpDevKitExtensionExports(csharpLogObserver: CsharpLoggerObser
             // This list must be a subset of the monikers previously registered with our own container
             // as defined in the getBrokeredServiceContainer function.
             getBrokeredServiceContainer().profferServiceBroker(exports.serviceBroker, [
-                    Descriptors.launchConfigurationService.moniker,
-                    Descriptors.buildService.moniker
+                    Descriptors.dotnetDebugConfigurationService.moniker
                 ]
             );