Commitad87edb

forki

authored and

KevinRansom

committed

fixdotnet#2272 (dotnet#2273)

1 parente432d6b commitad87edbCopy full SHA for ad87edb

File tree

2 files changed

+27

-20

lines changed

src/fsharp/vs
- ServiceNavigation.fs
vsintegration/src/FSharp.Editor/Structure
- Structure.fs

2 files changed

+27

-20

lines changed

`‎src/fsharp/vs/ServiceNavigation.fs‎`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -264,15 +264,18 @@ module NavigationImpl =`
`264`	`264`	`letnested= processNestedDeclarations(decls)`
`265`	`265`	`// Get nested modules and types (for the left dropdown)`
`266`	`266`	`letother= processFSharpNavigationTopLevelDeclarations(baseName, decls)`
`267`		`-`
	`267`	`+`
`268`	`268`	`// Create explicitly - it can be 'single top level' thing that is hidden`
`269`		`-letdecl=`
`270`		`- FSharpNavigationDeclarationItem.Create`
`271`		`-(textOfLid id,(if isModulethen ModuleFileDeclelse NamespaceDecl),`
`272`		`- GlyphMajor.Module, m,`
`273`		`- unionRangesChecked(rangeOfDecls nested)(moduleRange(rangeOfLid id) other),`
`274`		`- singleTopLevel, access),(addItemName(textOfLid id)), nested`
`275`		`- decl::other)`
	`269`	`+match idwith`
	`270`	`+\|[]-> other`
	`271`	`+\|_->`
	`272`	`+letdecl=`
	`273`	`+ FSharpNavigationDeclarationItem.Create`
	`274`	`+(textOfLid id,(if isModulethen ModuleFileDeclelse NamespaceDecl),`
	`275`	`+ GlyphMajor.Module, m,`
	`276`	`+ unionRangesChecked(rangeOfDecls nested)(moduleRange(rangeOfLid id) other),`
	`277`	`+ singleTopLevel, access),(addItemName(textOfLid id)), nested`
	`278`	`+ decl::other)`
`276`	`279`
`277`	`280`	`letitems=`
`278`	`281`	`items`

`‎vsintegration/src/FSharp.Editor/Structure/Structure.fs‎`

Lines changed: 16 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -615,18 +615,22 @@ module internal Structure =`
`615`	`615`
`616`	`616`	`letprivateparseModuleOrNamespace(SynModuleOrNamespace.SynModuleOrNamespace(longId,_,isModule,decls,_,attribs,_,r))=`
`617`	`617`	`seq{`
`618`		`-yield! parseAttributes attribs`
`619`		`-letfullrange= Range.startToEnd(longIdentRange longId) r`
`620`		`-letcollapse= Range.endToEnd(longIdentRange longId) r`
`621`		`-if isModulethen`
`622`		`-yield! rcheck Scope.Module Collapse.Below fullrange collapse`
`623`		`-//else`
`624`		`-// //yield! rcheck Scope.Namespace Collapse.Below (Range.modEnd -1 fullrange) (Range.modEnd -1 collapse)`
`625`		`-// yield! rcheck Scope.Namespace Collapse.Below (fullrange) (collapse)`
`626`		`-`
`627`		`-yield! collectHashDirectives decls`
`628`		`-yield! collectOpens decls`
`629`		`-yield! Seq.collect parseDeclaration decls`
	`618`	`+match longIdwith`
	`619`	`+\|[]->()`
	`620`	`+\|_->`
	`621`	`+yield! parseAttributes attribs`
	`622`	`+letidRange= longIdentRange longId`
	`623`	`+letfullrange= Range.startToEnd idRange r`
	`624`	`+letcollapse= Range.endToEnd idRange r`
	`625`	`+if isModulethen`
	`626`	`+yield! rcheck Scope.Module Collapse.Below fullrange collapse`
	`627`	`+//else`
	`628`	`+// //yield! rcheck Scope.Namespace Collapse.Below (Range.modEnd -1 fullrange) (Range.modEnd -1 collapse)`
	`629`	`+// yield! rcheck Scope.Namespace Collapse.Below (fullrange) (collapse)`
	`630`	`+`
	`631`	`+yield! collectHashDirectives decls`
	`632`	`+yield! collectOpens decls`
	`633`	`+yield! Seq.collect parseDeclaration decls`
`630`	`634`	`}`
`631`	`635`
`632`	`636`	`typeprivateLineNum= int`

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!

Commitad87edb

File tree

2 files changed

2 files changed

`‎src/fsharp/vs/ServiceNavigation.fs‎`

`‎vsintegration/src/FSharp.Editor/Structure/Structure.fs‎`

0 commit comments