Fix custom Razor commands for cohosting (#8251)

Author: davidwengier

l10n/bundle.l10n.json

@@ -103,6 +103,7 @@
   "Non Razor file as active document": "Non Razor file as active document",
   "Could not determine CSharp content": "Could not determine CSharp content",
   "Could not determine Html content": "Could not determine Html content",
+  "Cohosting is on, client has no access to CSharp content": "Cohosting is on, client has no access to CSharp content",
   "A valid dotnet installation could not be found: {0}": "A valid dotnet installation could not be found: {0}",
   "Is this a Bug or Feature request?": "Is this a Bug or Feature request?",
   "Bug": "Bug",

package.json

@@ -1881,12 +1881,14 @@
       {
         "command": "extension.showRazorCSharpWindow",
         "title": "%command.extension.showRazorCSharpWindow%",
-        "category": "Razor"
+        "category": "Razor",
+        "enablement": "razor.mode == 'lsp'"
       },
       {
         "command": "extension.showRazorHtmlWindow",
         "title": "%command.extension.showRazorHtmlWindow%",
-        "category": "Razor"
+        "category": "Razor",
+        "enablement": "razor.mode == 'lsp'"
       },
       {
         "command": "razor.reportIssue",

src/lsptoolshost/razor/razorEndpoints.ts

@@ -49,6 +49,7 @@ import { MappingHandler } from '../../razor/src/mapping/mappingHandler';
 import { RazorMapTextChangesParams } from '../../razor/src/mapping/razorMapTextChangesParams';
 import { RazorMapTextChangesResponse } from '../../razor/src/mapping/razorMapTextChangesResponse';
 import { FormattingHandler } from '../../razor/src/formatting/formattingHandler';
+import { ReportIssueCommand } from '../../razor/src/diagnostics/reportIssueCommand';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
@@ -62,8 +63,10 @@ export function registerRazorEndpoints(
     );
 
     if (razorOptions.cohostingEnabled) {
+        vscode.commands.executeCommand('setContext', 'razor.mode', 'cohosting');
         registerCohostingEndpoints();
     } else {
+        vscode.commands.executeCommand('setContext', 'razor.mode', 'lsp');
         registerNonCohostingEndpoints();
     }
 
@@ -74,7 +77,9 @@ export function registerRazorEndpoints(
     //
     function registerCohostingEndpoints() {
         const documentManager = new HtmlDocumentManager(platformInfo, razorLogger);
+        const reportIssueCommand = new ReportIssueCommand(vscode, undefined, documentManager, razorLogger);
         context.subscriptions.push(documentManager.register());
+        context.subscriptions.push(reportIssueCommand.register());
 
         registerMethodHandler<HtmlUpdateParameters, void>('razor/updateHtml', async (params) => {
             const uri = UriConverter.deserialize(params.textDocument.uri);

src/razor/src/diagnostics/razorIssueDataCollector.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { HtmlDocumentManager } from '../../../lsptoolshost/razor/htmlDocumentManager';
 import { RazorDocumentManager } from '../document/razorDocumentManager';
 import { RazorLogger } from '../razorLogger';
 import { api } from '../vscodeAdapter';
@@ -16,9 +17,14 @@ export class ReportIssueCommand {
     private readonly issueCreator: ReportIssueCreator;
     private readonly dataCollectorFactory: ReportIssueDataCollectorFactory;
 
-    constructor(private readonly vscodeApi: api, documentManager: RazorDocumentManager, logger: RazorLogger) {
+    constructor(
+        private readonly vscodeApi: api,
+        documentManager: RazorDocumentManager | undefined,
+        cohostingDocumentManager: HtmlDocumentManager | undefined,
+        logger: RazorLogger
+    ) {
         this.dataCollectorFactory = new ReportIssueDataCollectorFactory(logger);
-        this.issueCreator = new ReportIssueCreator(this.vscodeApi, documentManager);
+        this.issueCreator = new ReportIssueCreator(this.vscodeApi, documentManager, cohostingDocumentManager);
         this.issuePanel = new ReportIssuePanel(this.dataCollectorFactory, this.issueCreator, logger);
     }
 

src/razor/src/diagnostics/reportIssueCommand.ts

@@ -11,28 +11,36 @@ import { IRazorDocument } from '../document/IRazorDocument';
 import { IRazorDocumentManager } from '../document/IRazorDocumentManager';
 import { razorExtensionId } from '../razorExtensionId';
 import { IReportIssueDataCollectionResult } from './IReportIssueDataCollectionResult';
+import { HtmlDocumentManager } from '../../../lsptoolshost/razor/htmlDocumentManager';
 
 export class ReportIssueCreator {
     constructor(
         private readonly vscodeApi: vscodeAdapter.api,
-        private readonly documentManager: IRazorDocumentManager
+        private readonly documentManager?: IRazorDocumentManager,
+        private readonly cohostingDocumentManager?: HtmlDocumentManager
     ) {}
 
     public async create(collectionResult: IReportIssueDataCollectionResult) {
         let razorContent: string;
         let csharpContent: string;
         let htmlContent: string;
 
+        razorContent = vscode.l10n.t('Non Razor file as active document');
+        csharpContent = vscode.l10n.t('Could not determine CSharp content');
+        htmlContent = vscode.l10n.t('Could not determine Html content');
+
         if (collectionResult.document) {
             razorContent = await this.getRazor(collectionResult.document);
 
-            const razorDocument = await this.documentManager.getDocument(collectionResult.document.uri);
-            csharpContent = await this.getProjectedCSharp(razorDocument);
-            htmlContent = await this.getProjectedHtml(razorDocument);
-        } else {
-            razorContent = vscode.l10n.t('Non Razor file as active document');
-            csharpContent = vscode.l10n.t('Could not determine CSharp content');
-            htmlContent = vscode.l10n.t('Could not determine Html content');
+            if (this.documentManager) {
+                const razorDocument = await this.documentManager.getDocument(collectionResult.document.uri);
+                csharpContent = await this.getProjectedCSharp(razorDocument);
+                htmlContent = await this.getProjectedHtml(razorDocument);
+            } else if (this.cohostingDocumentManager) {
+                const htmlDocument = await this.cohostingDocumentManager.getDocument(collectionResult.document.uri);
+                csharpContent = vscode.l10n.t('Cohosting is on, client has no access to CSharp content');
+                htmlContent = htmlDocument.getContent();
+            }
         }
 
         const razorExtensionVersion = this.getExtensionVersion();

src/razor/src/diagnostics/reportIssueCreator.ts

@@ -139,7 +139,7 @@ export async function activate(
         const csharpFeature = new RazorCSharpFeature(documentManager, eventEmitterFactory, logger);
         const htmlFeature = new RazorHtmlFeature(documentManager, languageServiceClient, eventEmitterFactory, logger);
         const localRegistrations: vscode.Disposable[] = [];
-        const reportIssueCommand = new ReportIssueCommand(vscodeType, documentManager, logger);
+        const reportIssueCommand = new ReportIssueCommand(vscodeType, documentManager, undefined, logger);
         const razorCodeActionRunner = new RazorCodeActionRunner(languageServerClient, logger);
         const codeActionsHandler = new CodeActionsHandler(
             documentManager,