Skip to content

Commit 4476c3c

Browse files
committed
Add Razor support to Project Context status when cohosting.
1 parent 884bb69 commit 4476c3c

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

src/lsptoolshost/projectContext/projectContextService.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { VSGetProjectContextsRequest, VSProjectContext, VSProjectContextList } f
99
import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
1010
import { UriConverter } from '../utils/uriConverter';
1111
import { LanguageServerEvents, ServerState } from '../server/languageServerEvents';
12+
import { razorOptions } from '../../shared/options';
1213

1314
export interface ProjectContextChangeEvent {
1415
languageId: string;
@@ -53,7 +54,14 @@ export class ProjectContextService {
5354
const textEditor = vscode.window.activeTextEditor;
5455
const languageId = textEditor?.document?.languageId;
5556
if (languageId !== 'csharp') {
56-
return;
57+
if (languageId !== 'aspnetcorerazor') {
58+
return;
59+
}
60+
61+
// We only support Razor when cohosting is enabled.
62+
if (!razorOptions.cohostingEnabled) {
63+
return;
64+
}
5765
}
5866

5967
// If we have an open request, cancel it.

src/lsptoolshost/projectContext/projectContextStatus.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
import * as vscode from 'vscode';
77
import { RoslynLanguageServer } from '../server/roslynLanguageServer';
8-
import { languageServerOptions } from '../../shared/options';
8+
import { languageServerOptions, razorOptions } from '../../shared/options';
99
import { RazorLanguage } from '../../razor/src/razorLanguage';
1010
import { ServerState } from '../server/languageServerEvents';
1111
import { combineDocumentSelectors } from '../../shared/utils/combineDocumentSelectors';
1212

1313
export class ProjectContextStatus {
1414
static createStatusItem(context: vscode.ExtensionContext, languageServer: RoslynLanguageServer) {
15-
const documentSelector = combineDocumentSelectors(
16-
languageServerOptions.documentSelector,
17-
RazorLanguage.documentSelector
18-
);
15+
// We only support Razor when cohosting is enabled.
16+
const documentSelector = razorOptions.cohostingEnabled
17+
? combineDocumentSelectors(languageServerOptions.documentSelector, RazorLanguage.documentSelector)
18+
: combineDocumentSelectors(languageServerOptions.documentSelector);
1919
const projectContextService = languageServer._projectContextService;
2020

2121
const item = vscode.languages.createLanguageStatusItem('csharp.projectContextStatus', documentSelector);

0 commit comments

Comments
 (0)