Skip to content

Commit ae3ba3f

Browse files
authored
Download Razor before start OmniSharp (#5984)
1 parent b11d31e commit ae3ba3f

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

src/main.ts

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,24 @@ export async function activate(
225225
eventStream.subscribe(omnisharpDebugModeLoggerObserver.post);
226226
}
227227

228+
const razorObserver = new RazorLoggerObserver(csharpChannel);
229+
eventStream.subscribe(razorObserver.post);
230+
231+
if (!razorOptions.razorDevMode) {
232+
// Download Razor O# server
233+
const razorOmnisharpDownloader = new RazorOmnisharpDownloader(
234+
networkSettingsProvider,
235+
eventStream,
236+
context.extension.packageJSON,
237+
platformInfo,
238+
context.extension.extensionPath
239+
);
240+
241+
await razorOmnisharpDownloader.DownloadAndInstallRazorOmnisharp(
242+
context.extension.packageJSON.defaults.razorOmnisharp
243+
);
244+
}
245+
228246
// activate language services
229247
omnisharpLangServicePromise = OmniSharp.activate(
230248
context,
@@ -250,22 +268,7 @@ export async function activate(
250268
})
251269
);
252270

253-
const razorObserver = new RazorLoggerObserver(csharpChannel);
254-
eventStream.subscribe(razorObserver.post);
255-
256271
if (!razorOptions.razorDevMode) {
257-
// Download Razor O# server
258-
const razorOmnisharpDownloader = new RazorOmnisharpDownloader(
259-
networkSettingsProvider,
260-
eventStream,
261-
context.extension.packageJSON,
262-
platformInfo,
263-
context.extension.extensionPath
264-
);
265-
266-
await razorOmnisharpDownloader.DownloadAndInstallRazorOmnisharp(
267-
context.extension.packageJSON.defaults.razorOmnisharp
268-
);
269272
omnisharpRazorPromise = activateRazorExtension(
270273
context,
271274
context.extension.extensionPath,

0 commit comments

Comments
 (0)