Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8724793

Browse files
committed
Merge issues
1 parent094f373 commit8724793

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

‎vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,21 +231,22 @@ type internal FSharpProjectOptionsManager
231231
Some(reporter:> Microsoft.VisualStudio.Shell.Interop.IVsLanguageServiceBuildErrorReporter2)
232232

233233
{new Microsoft.VisualStudio.FSharp.LanguageService.IProjectSitewith
234-
member__.SourceFilesOnDisk()= this.GetProjectInfo(project.FilePath)|> fst
235-
member__.DescriptionOfProject()= project.Name
236-
member__.CompilerFlags()=
234+
member__.CompilationSourceFiles= this.GetProjectInfo(project.FilePath)|> fst
235+
member__.CompilationOptions=
237236
let_,references,options= this.GetProjectInfo(project.FilePath)
238237
Array.concat[options; references|> Array.map(fun r->"-r:"+ r)]
239-
member__.ProjectFileName()= project.FilePath
238+
member__.CompilationReferences= this.GetProjectInfo(project.FilePath)|> thrd
239+
membersite.CompilationBinOutputPath= site.CompilationOptions|> Array.tryPick(fun s->if s.StartsWith("-o:")then Some s.[3..]else None)
240+
member__.Description= project.Name
241+
member__.ProjectFileName= project.FilePath
240242
member__.AdviseProjectSiteChanges(_,_)=()
241243
member__.AdviseProjectSiteCleaned(_,_)=()
242244
member__.AdviseProjectSiteClosed(_,_)=()
243245
member__.IsIncompleteTypeCheckEnvironment=false
244246
member__.TargetFrameworkMoniker=""
245-
member__.ProjectGuid=project.Id.Id.ToString()
247+
member__.ProjectGuid= project.Id.Id.ToString()
246248
member__.LoadTime= System.DateTime.Now
247249
member__.ProjectProvider= Some iProvideProjectSite
248-
member__.AssemblyReferences()= this.GetProjectInfo(project.FilePath)|> thrd
249250
member__.BuildErrorReporterwith get()= errorReporterand
250251
set(v)= errorReporter<- v
251252
}
@@ -483,7 +484,7 @@ type
483484
projectContext.RemoveSourceFile(file)
484485
updated<-true
485486

486-
letupdatedRefs= site.AssemblyReferences()|> wellFormedFilePathSetIgnoreCase
487+
letupdatedRefs= site.CompilationReferences|> wellFormedFilePathSetIgnoreCase
487488
letoriginalRefs= project.GetCurrentMetadataReferences()|> Seq.map(fun ref-> ref.FilePath)|> wellFormedFilePathSetIgnoreCase
488489

489490
for refin updatedRefsdo

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp