@@ -93,7 +93,7 @@ export class OmniSharpServer {
9393 private updateProjectDebouncer = new Subject < ObservableEvents . ProjectModified > ( ) ;
9494 private firstUpdateProject : boolean ;
9595
96- constructor ( private vscode : vscode , networkSettingsProvider : NetworkSettingsProvider , private packageJSON : any , private platformInfo : PlatformInformation , private eventStream : EventStream , private optionProvider : OptionProvider , extensionPath : string , private monoResolver : IMonoResolver ) {
96+ constructor ( private vscode : vscode , networkSettingsProvider : NetworkSettingsProvider , private packageJSON : any , private platformInfo : PlatformInformation , private eventStream : EventStream , private optionProvider : OptionProvider , private extensionPath : string , private monoResolver : IMonoResolver ) {
9797 this . _requestQueue = new RequestQueueCollection ( this . eventStream , 8 , request => this . _makeRequest ( request ) ) ;
9898 let downloader = new OmnisharpDownloader ( networkSettingsProvider , this . eventStream , this . packageJSON , platformInfo , extensionPath ) ;
9999 this . _omnisharpManager = new OmnisharpManager ( downloader , platformInfo ) ;
@@ -306,7 +306,7 @@ export class OmniSharpServer {
306306
307307 if ( ! options . razorDisabled ) {
308308 const razorPluginPath = path . join (
309- utils . getExtensionPath ( ) ,
309+ this . extensionPath ,
310310 '.razor' ,
311311 'OmniSharpPlugin' ,
312312 'Microsoft.AspNetCore.Razor.OmniSharpPlugin.dll' ) ;
@@ -319,8 +319,7 @@ export class OmniSharpServer {
319319
320320 let launchInfo : LaunchInfo ;
321321 try {
322- let extensionPath = utils . getExtensionPath ( ) ;
323- launchInfo = await this . _omnisharpManager . GetOmniSharpLaunchInfo ( this . packageJSON . defaults . omniSharp , options . path , serverUrl , latestVersionFileServerPath , installPath , extensionPath ) ;
322+ launchInfo = await this . _omnisharpManager . GetOmniSharpLaunchInfo ( this . packageJSON . defaults . omniSharp , options . path , serverUrl , latestVersionFileServerPath , installPath , this . extensionPath ) ;
324323 }
325324 catch ( error ) {
326325 this . eventStream . post ( new ObservableEvents . OmnisharpFailure ( `Error occured in loading omnisharp from omnisharp.path\nCould not start the server due to ${ error . toString ( ) } ` , error ) ) ;
0 commit comments