fix change project context from command palette (#8930)

Author: dibarbet

l10n/bundle.l10n.json

@@ -141,6 +141,7 @@
   "Text editor must be focused to fix all issues": "Text editor must be focused to fix all issues",
   "Fix all issues": "Fix all issues",
   "Select fix all action": "Select fix all action",
+  "No file selected to change project context.": "No file selected to change project context.",
   "C# LSP Trace Logs": "C# LSP Trace Logs",
   "Open solution": "Open solution",
   "Restart server": "Restart server",
@@ -166,7 +167,6 @@
   "C# Project Context Status": "C# Project Context Status",
   "Active Context": "Active Context",
   "Not all language features will be available.": "Not all language features will be available.",
-  "No file selected to change project context.": "No file selected to change project context.",
   "Failed to change context for {0}: {1}": "Failed to change context for {0}: {1}",
   "Select project context": "Select project context",
   "Initializing dotnet-trace.../dotnet-trace is a command name and should not be localized": {

src/lsptoolshost/commands.ts

@@ -52,10 +52,13 @@ function registerExtensionCommands(
     reporter: TelemetryReporter
 ) {
     context.subscriptions.push(
-        vscode.commands.registerCommand(changeProjectContextCommandName, async (document, options) => {
-            reporter.sendTelemetryEvent(TelemetryEventNames.ProjectContextChangeCommand);
-            await changeProjectContext(languageServer, document, options);
-        })
+        vscode.commands.registerCommand(
+            changeProjectContextCommandName,
+            async (document: vscode.TextDocument | undefined, options) => {
+                reporter.sendTelemetryEvent(TelemetryEventNames.ProjectContextChangeCommand);
+                await changeProjectContext(languageServer, document, options);
+            }
+        )
     );
     context.subscriptions.push(
         vscode.commands.registerCommand(changeProjectContextFileExplorer, async (uri) => {

src/lsptoolshost/projectContext/projectContextCommands.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as vscode from 'vscode';
+import { isRelevantDocument } from './projectContextService';
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
 import { VSProjectContext } from '../server/roslynProtocol';
 import { CancellationToken } from 'vscode-languageclient/node';
@@ -31,9 +32,15 @@ export async function openAndChangeProjectContext(
 
 export async function changeProjectContext(
     languageServer: RoslynLanguageServer,
-    document: vscode.TextDocument,
+    document: vscode.TextDocument | undefined,
     options: ChangeProjectContextOptions | undefined
 ): Promise<VSProjectContext | undefined> {
+    document = document ?? vscode.window.activeTextEditor?.document;
+    if (!isRelevantDocument(document)) {
+        vscode.window.showErrorMessage(vscode.l10n.t('No file selected to change project context.'));
+        return;
+    }
+
     const contextList = await languageServer._projectContextService.queryServerProjectContexts(
         document.uri,
         CancellationToken.None

src/lsptoolshost/projectContext/projectContextService.ts

@@ -33,7 +33,19 @@ type UriString = string;
 const VerificationDelay = 5 * 1000;
 
 let _verifyTimeout: NodeJS.Timeout | undefined;
-let _documentUriToVerify: vscode.Uri | undefined;
+
+const _documentSelector = combineDocumentSelectors(
+    languageServerOptions.documentSelector,
+    RazorLanguage.documentSelector
+);
+
+export function isRelevantDocument(document: vscode.TextDocument | undefined): document is vscode.TextDocument {
+    if (document === undefined) {
+        return false;
+    }
+
+    return vscode.languages.match(_documentSelector, document) > 0;
+}
 
 export class ProjectContextService {
     // This map tracks which project context is active for a given context key. New entries are
@@ -59,11 +71,6 @@ export class ProjectContextService {
         _vs_is_miscellaneous: false,
     };
 
-    private readonly _documentSelector = combineDocumentSelectors(
-        languageServerOptions.documentSelector,
-        RazorLanguage.documentSelector
-    );
-
     constructor(
         private _languageServer: RoslynLanguageServer,
         _languageClient: RoslynLanguageClient,
@@ -105,7 +112,7 @@ export class ProjectContextService {
         contextList: VSProjectContextList,
         context: VSProjectContext
     ): Promise<void> {
-        if (!this.isRelevantDocument(document)) {
+        if (!isRelevantDocument(document)) {
             return;
         }
 
@@ -127,7 +134,7 @@ export class ProjectContextService {
 
     public async refresh() {
         const textEditor = vscode.window.activeTextEditor;
-        if (!this.isRelevantDocument(textEditor?.document)) {
+        if (!isRelevantDocument(textEditor?.document)) {
             return;
         }
 
@@ -145,10 +152,6 @@ export class ProjectContextService {
             _verifyTimeout = undefined;
         }
 
-        if (_documentUriToVerify) {
-            _documentUriToVerify = undefined;
-        }
-
         if (!this._languageServer.isRunning()) {
             this._contextChangeEmitter.fire({
                 document,
@@ -210,14 +213,6 @@ export class ProjectContextService {
         }
     }
 
-    private isRelevantDocument(document: vscode.TextDocument | undefined): boolean {
-        if (document === undefined) {
-            return false;
-        }
-
-        return vscode.languages.match(this._documentSelector, document) > 0;
-    }
-
     private updateCaches(uriString: UriString, contextList: VSProjectContextList) {
         const oldContextKey = this._uriToContextKeyMap.get(uriString);
         const newContextKey = contextList._vs_key;