Change log level and restart ext host

Author: JoeRobich

l10n/bundle.l10n.json

@@ -1,6 +1,6 @@
 {
-  "Reload Window": "Reload Window",
-  "Workspace trust has changed. Would you like to reload the window to activate the C# extension?": "Workspace trust has changed. Would you like to reload the window to activate the C# extension?",
+  "Reload C# Extension": "Reload C# Extension",
+  "Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
   "How to setup Remote Debugging": "How to setup Remote Debugging",
   "The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.",
   "The C# extension for Visual Studio Code is incompatible on {0} {1}.": "The C# extension for Visual Studio Code is incompatible on {0} {1}.",
@@ -148,6 +148,7 @@
   "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.": "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.",
   "Download Mono": "Download Mono",
   "Open settings": "Open settings",
+  "Reload Window": "Reload Window",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
   "Restart Language Server": "Restart Language Server",

src/main.ts

@@ -97,63 +97,66 @@ export async function activate(
         requiredPackageIds
     );
 
-    const getCoreClrDebugPromise = async (languageServerStartedPromise: Promise<void>) => {
-        let coreClrDebugPromise = Promise.resolve();
-        if (runtimeDependenciesExist) {
-            // activate coreclr-debug
-            coreClrDebugPromise = coreclrdebug.activate(
-                context.extension,
-                context,
-                platformInfo,
-                eventStream,
-                csharpChannel,
-                languageServerStartedPromise
-            );
-        }
-
-        return coreClrDebugPromise;
-    };
-
     let activationEvent = TelemetryEventNames.CSharpActivated;
     let exports: CSharpExtensionExports | OmnisharpExtensionExports | LimitedExtensionExports;
     if (vscode.workspace.isTrusted !== true) {
         activationEvent = TelemetryEventNames.CSharpLimitedActivation;
+        await vscode.commands.executeCommand('setContext', 'dotnet.server.activationContext', 'Limited');
         exports = { isLimitedActivation: true };
-        csharpChannel.trace('C# Extension activated in limited mode due to workspace trust not being granted.');
+        csharpChannel.info('C# Extension activated in limited mode due to workspace trust not being granted.');
         context.subscriptions.push(
             vscode.workspace.onDidGrantWorkspaceTrust(() => {
                 const reloadTitle: CommandOption = {
-                    title: vscode.l10n.t('Reload Window'),
-                    command: 'workbench.action.reloadWindow',
+                    title: vscode.l10n.t('Reload C# Extension'),
+                    command: 'workbench.action.restartExtensionHost',
                 };
                 const message = vscode.l10n.t(
-                    'Workspace trust has changed. Would you like to reload the window to activate the C# extension?'
+                    'Workspace trust has changed. Would you like to reload the C# extension?'
                 );
                 showInformationMessage(vscode, message, reloadTitle);
             })
         );
-    } else if (!useOmnisharpServer) {
-        exports = activateRoslyn(
-            context,
-            platformInfo,
-            optionStream,
-            eventStream,
-            csharpChannel,
-            reporter,
-            csharpDevkitExtension,
-            getCoreClrDebugPromise
-        );
     } else {
-        exports = activateOmniSharp(
-            context,
-            platformInfo,
-            optionStream,
-            networkSettingsProvider,
-            eventStream,
-            csharpChannel,
-            reporter,
-            getCoreClrDebugPromise
-        );
+        const getCoreClrDebugPromise = async (languageServerStartedPromise: Promise<void>) => {
+            let coreClrDebugPromise = Promise.resolve();
+            if (runtimeDependenciesExist) {
+                // activate coreclr-debug
+                coreClrDebugPromise = coreclrdebug.activate(
+                    context.extension,
+                    context,
+                    platformInfo,
+                    eventStream,
+                    csharpChannel,
+                    languageServerStartedPromise
+                );
+            }
+
+            return coreClrDebugPromise;
+        };
+
+        if (!useOmnisharpServer) {
+            exports = activateRoslyn(
+                context,
+                platformInfo,
+                optionStream,
+                eventStream,
+                csharpChannel,
+                reporter,
+                csharpDevkitExtension,
+                getCoreClrDebugPromise
+            );
+        } else {
+            exports = activateOmniSharp(
+                context,
+                platformInfo,
+                optionStream,
+                networkSettingsProvider,
+                eventStream,
+                csharpChannel,
+                reporter,
+                getCoreClrDebugPromise
+            );
+        }
     }
 
     const timeTaken = process.hrtime(startActivation);