Commit2dc9f6f

dungpa

authored and

KevinRansom

committed

Normalize project display names for standalone projects (dotnet#2164)

1 parentb3f6501 commit2dc9f6fCopy full SHA for 2dc9f6f

File tree

1 file changed

+12

-9

lines changed

vsintegration/src/FSharp.Editor/Common
- LanguageService.fs

1 file changed

+12

-9

lines changed

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

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,10 @@ type internal FSharpLanguageService(package : FSharpPackage) as this =`
`220`	`220`	`letcheckerProvider= this.Package.ComponentModel.DefaultExportProvider.GetExport<FSharpCheckerProvider>().Value`
`221`	`221`	`letprojectInfoManager= this.Package.ComponentModel.DefaultExportProvider.GetExport<ProjectInfoManager>().Value`
`222`	`222`
	`223`	`+letprojectDisplayNameOf projectFileName=`
	`224`	`+if String.IsNullOrWhiteSpace projectFileNamethen projectFileName`
	`225`	`+else Path.GetFileNameWithoutExtension projectFileName`
	`226`	`+`
`223`	`227`	`/// Sync the information for the project`
`224`	`228`	`memberthis.SyncProject(project:AbstractProject,projectContext:IWorkspaceProjectContext,site:IProjectSite,forceUpdate)=`
`225`	`229`
`@@ -248,16 +252,13 @@ type internal FSharpLanguageService(package : FSharpPackage) as this =`
`248`	`252`	`letprojectGuid= Guid(site.ProjectGuid)`
`249`	`253`	`letprojectFileName= site.ProjectFileName()`
`250`	`254`
`251`		`-letprojectDisplayName=`
`252`		`-if String.IsNullOrWhiteSpace projectFileNamethen projectFileName`
`253`		`-else Path.GetFileNameWithoutExtension projectFileName`
	`255`	`+letprojectDisplayName= projectDisplayNameOf projectFileName`
`254`	`256`
`255`	`257`	`letprojectId= workspace.ProjectTracker.GetOrCreateProjectIdForPath(projectFileName, projectDisplayName)`
`256`	`258`
`257`	`259`	`projectInfoManager.UpdateProjectInfo(projectId, site, workspace)`
`258`	`260`
`259`		`-match workspace.ProjectTracker.GetProject(projectId)with`
`260`		`-\|null->`
	`261`	`+if isNull(workspace.ProjectTracker.GetProject projectId)then`
`261`	`262`	`letprojectContextFactory= this.Package.ComponentModel.GetService<IWorkspaceProjectContextFactory>();`
`262`	`263`	`leterrorReporter= ProjectExternalErrorReporter(projectId,"FS", this.SystemServiceProvider)`
`263`	`264`
`@@ -277,7 +278,6 @@ type internal FSharpLanguageService(package : FSharpPackage) as this =`
`277`	`278`	`for referencedSitein ProjectSitesAndFiles.GetReferencedProjectSites(site, this.SystemServiceProvider)do`
`278`	`279`	`letreferencedProjectId= setup referencedSite`
`279`	`280`	`project.AddProjectReference(ProjectReference referencedProjectId)`
`280`		`-\|_->()`
`281`	`281`	`projectId`
`282`	`282`	`setup(siteProvider.GetProjectSite())\|> ignore`
`283`	`283`
`@@ -286,14 +286,17 @@ type internal FSharpLanguageService(package : FSharpPackage) as this =`
`286`	`286`	`letloadTime= DateTime.Now`
`287`	`287`	`letoptions= projectInfoManager.ComputeSingleFileOptions(fileName, loadTime, fileContents, workspace)\|> Async.RunSynchronously`
`288`	`288`
`289`		`-letprojectId= workspace.ProjectTracker.GetOrCreateProjectIdForPath(options.ProjectFileName, options.ProjectFileName)`
	`289`	`+letprojectFileName= fileName`
	`290`	`+letprojectDisplayName= projectDisplayNameOf projectFileName`
	`291`	`+`
	`292`	`+letprojectId= workspace.ProjectTracker.GetOrCreateProjectIdForPath(projectFileName, projectDisplayName)`
`290`	`293`	`projectInfoManager.AddSingleFileProject(projectId,(loadTime, options))`
`291`	`294`
`292`		`-ifobj.ReferenceEquals(workspace.ProjectTracker.GetProject(projectId),null)then`
	`295`	`+ifisNull(workspace.ProjectTracker.GetProject projectId)then`
`293`	`296`	`letprojectContextFactory= this.Package.ComponentModel.GetService<IWorkspaceProjectContextFactory>();`
`294`	`297`	`leterrorReporter= ProjectExternalErrorReporter(projectId,"FS", this.SystemServiceProvider)`
`295`	`298`
`296`		`-letprojectContext= projectContextFactory.CreateProjectContext(FSharpCommonConstants.FSharpLanguageName,options.ProjectFileName, options.ProjectFileName, projectId.Id, hier,null, errorReporter)`
	`299`	`+letprojectContext= projectContextFactory.CreateProjectContext(FSharpCommonConstants.FSharpLanguageName,projectDisplayName, projectFileName, projectId.Id, hier,null, errorReporter)`
`297`	`300`	`projectContext.AddSourceFile(fileName)`
`298`	`301`
`299`	`302`	`letproject= projectContext:?> AbstractProject`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2dc9f6f

File tree

1 file changed

1 file changed

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

0 commit comments