Commit9f6338c

authored and

committed

show project name instead of full project file path in Navigation Bar and all other place where project display name is used (dotnet#2038)

1 parentdfb7950 commit9f6338cCopy full SHA for 9f6338c

File tree

+10

-1

lines changed

vsintegration/src/FSharp.Editor
- LanguageService.fs
- Structure
  - BlockStructureService.fs

+10

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,15 @@ type internal FSharpLanguageService(package : FSharpPackage) as this =`
`241`	`241`	`\|null->`
`242`	`242`	`letprojectContextFactory= this.Package.ComponentModel.GetService<IWorkspaceProjectContextFactory>();`
`243`	`243`	`leterrorReporter= ProjectExternalErrorReporter(projectId,"FS", this.SystemServiceProvider)`
	`244`	`+`
	`245`	`+letprojectDisplayName=`
	`246`	`+if String.IsNullOrWhiteSpace projectFileNamethen projectFileName`
	`247`	`+else Path.GetFileNameWithoutExtension projectFileName`
	`248`	`+`
	`249`	`+letprojectContext=`
	`250`	`+ projectContextFactory.CreateProjectContext(`
	`251`	`+ FSharpCommonConstants.FSharpLanguageName, projectDisplayName, projectFileName, projectGuid, siteProvider,null, errorReporter)`
`244`	`252`
`245`		`-letprojectContext= projectContextFactory.CreateProjectContext(FSharpCommonConstants.FSharpLanguageName, projectFileName, projectFileName, projectGuid, siteProvider,null, errorReporter)`
`246`	`253`	`letproject= projectContext:?> AbstractProject`
`247`	`254`
`248`	`255`	`this.SyncProject(project, projectContext, site, forceUpdate=false)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ type internal FSharpBlockStructureService(checker: FSharpChecker, projectInfoMan`
`97`	`97`	`\| Some parsedInput->`
`98`	`98`	`letblockSpans=`
`99`	`99`	`Structure.getOutliningRanges(sourceText.Lines\|> Seq.map(fun x-> x.ToString())\|> Seq.toArray) parsedInput`
	`100`	`+// it's crucial to not return more than one BlockSpan, othewise Roslyn crashes Visual Studio when user hover`
	`101`	`+// mouse over guide lines.`
`100`	`102`	`\|> Seq.distinctBy(fun x-> x.Range.StartLine)`
`101`	`103`	`\|> Seq.choose(fun range->`
`102`	`104`	`CommonRoslynHelpers.TryFSharpRangeToTextSpan(sourceText, range.Range)`

Comments

(0)