@@ -378,6 +378,12 @@ let tryLoadSolutionOnPath
378
378
solutionPath =
379
379
let progress = ProgressReporter( lspClient)
380
380
381
+ let logMessage m =
382
+ lspClient.WindowLogMessage({
383
+ Type = MessageType.Info
384
+ Message = sprintf " csharp-ls: %s " m
385
+ })
386
+
381
387
let showMessage m =
382
388
lspClient.WindowShowMessage({
383
389
Type = MessageType.Info
@@ -388,7 +394,7 @@ let tryLoadSolutionOnPath
388
394
try
389
395
let beginMessage = sprintf " Loading solution \" %s \" ..." solutionPath
390
396
do ! progress.Begin( beginMessage)
391
- do ! showMessage beginMessage
397
+ do ! logMessage beginMessage
392
398
393
399
let msbuildWorkspace = MSBuildWorkspace.Create( CSharpLspHostServices())
394
400
msbuildWorkspace.LoadMetadataForReferencedProjects <- true
@@ -401,11 +407,11 @@ let tryLoadSolutionOnPath
401
407
>> Log.addContext " message" ( diag.ToString())
402
408
)
403
409
404
- do ! showMessage ( sprintf " msbuildWorkspace.Diagnostics: %s " ( diag.ToString()))
410
+ do ! logMessage ( sprintf " msbuildWorkspace.Diagnostics: %s " ( diag.ToString()))
405
411
406
412
let endMessage = sprintf " Finished loading solution \" %s \" " solutionPath
407
413
do ! progress.End endMessage
408
- do ! showMessage endMessage
414
+ do ! logMessage endMessage
409
415
410
416
return Some solution
411
417
with
@@ -419,7 +425,7 @@ let tryLoadSolutionOnPath
419
425
let tryLoadSolutionFromProjectFiles
420
426
( lspClient : ILspClient )
421
427
( logger : ILog )
422
- ( showMessage : string -> Async < unit >)
428
+ ( logMessage : string -> Async < unit >)
423
429
( projs : string list ) =
424
430
let progress = ProgressReporter( lspClient)
425
431
@@ -431,7 +437,7 @@ let tryLoadSolutionFromProjectFiles
431
437
msbuildWorkspace.LoadMetadataForReferencedProjects <- true
432
438
for file in projs do
433
439
if projs.Length < 10 then
434
- do ! showMessage ( sprintf " loading project \" %s \" .." file)
440
+ do ! logMessage ( sprintf " loading project \" %s \" .." file)
435
441
try
436
442
do ! msbuildWorkspace.OpenProjectAsync( file) |> Async.AwaitTask |> Async.Ignore
437
443
with ex ->
@@ -473,13 +479,13 @@ let findAndLoadSolutionOnDir
473
479
|> Seq.filter fileNotOnNodeModules
474
480
|> Seq.toList
475
481
476
- let showMessage m =
477
- lspClient.WindowShowMessage ({
482
+ let logMessage m =
483
+ lspClient.WindowLogMessage ({
478
484
Type = MessageType.Info
479
485
Message = sprintf " csharp-ls: %s " m
480
486
})
481
487
482
- do ! showMessage ( sprintf " %d solution(s) found: [%s ]" solutionFiles.Length ( String.Join( " , " , solutionFiles)) )
488
+ do ! logMessage ( sprintf " %d solution(s) found: [%s ]" solutionFiles.Length ( String.Join( " , " , solutionFiles)) )
483
489
484
490
let singleSolutionFound =
485
491
match solutionFiles with
@@ -488,8 +494,8 @@ let findAndLoadSolutionOnDir
488
494
489
495
match singleSolutionFound with
490
496
| None ->
491
- do ! showMessage ( " no or multiple .sln files found on " + dir)
492
- do ! showMessage ( " looking for .csproj/fsproj files on " + dir + " .." )
497
+ do ! logMessage ( " no or multiple .sln files found on " + dir)
498
+ do ! logMessage ( " looking for .csproj/fsproj files on " + dir + " .." )
493
499
494
500
let projFiles =
495
501
let csprojFiles = Directory.GetFiles( dir, " *.csproj" , SearchOption.AllDirectories)
@@ -501,10 +507,10 @@ let findAndLoadSolutionOnDir
501
507
502
508
if projFiles.Length = 0 then
503
509
let message = " no or .csproj/.fsproj or sln files found on " + dir
504
- do ! showMessage message
510
+ do ! logMessage message
505
511
Exception message |> raise
506
512
507
- return ! tryLoadSolutionFromProjectFiles lspClient logger showMessage projFiles
513
+ return ! tryLoadSolutionFromProjectFiles lspClient logger logMessage projFiles
508
514
509
515
| Some solutionPath ->
510
516
return ! tryLoadSolutionOnPath lspClient logger solutionPath
@@ -521,12 +527,12 @@ let loadSolutionOnSolutionPathOrDir
521
527
}
522
528
523
529
| None -> async {
524
- let logMessage : ShowMessageParams = {
530
+ let logMessage : LogMessageParams = {
525
531
Type = MessageType.Info
526
532
Message = sprintf " csharp-ls: attempting to find and load solution based on root path (\" %s \" ).." rootPath
527
533
}
528
534
529
- do ! lspClient.WindowShowMessage ( logMessage)
535
+ do ! lspClient.WindowLogMessage ( logMessage)
530
536
return ! findAndLoadSolutionOnDir lspClient logger rootPath
531
537
}
532
538
0 commit comments