Commit7b99170

authored and

committed

colorize modules (dotnet#2036)

fixed: namespaces are colorized as part of qualified names

1 parent8e07ffe commit7b99170Copy full SHA for 7b99170

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1425,6 +1425,13 @@ type TypeCheckInfo`
`1425`	`1425`	`\| ItemOccurence.Binding_`
`1426`	`1426`	`\| ItemOccurence.Pattern_),_,_,_, m)->`
`1427`	`1427`	`Some(m, FSharpTokenColorKind.TypeName)`
	`1428`	`+\| CNR(_, Item.ModuleOrNamespaces refs,`
	`1429`	`+( ItemOccurence.UseInType`
	`1430`	`+\| ItemOccurence.UseInAttribute`
	`1431`	`+\| ItemOccurence.Use_`
	`1432`	`+\| ItemOccurence.Binding_`
	`1433`	`+\| ItemOccurence.Pattern_),_,_,_, m)when refs\|> List.exists(fun x-> x.IsModule)->`
	`1434`	`+ Some(m, FSharpTokenColorKind.TypeName)`
`1428`	`1435`	`\|_-> None)`
`1429`	`1436`	`\|> Seq.toArray`
`1430`	`1437`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ type internal FSharpColorizationService`
`59`	`59`	`\| FSharpCheckFileAnswer.Aborted->[\|\|]`
`60`	`60`	`\| FSharpCheckFileAnswer.Succeeded(results)->`
`61`	`61`	`[\|for(range, tokenColorKind)in results.GetExtraColorizationsAlternate()do`
`62`		`-letspan= CommonRoslynHelpers.FSharpRangeToTextSpan(sourceText, range)`
	`62`	`+letspan=CommonHelpers.fixupSpan(sourceText,CommonRoslynHelpers.FSharpRangeToTextSpan(sourceText, range))`
`63`	`63`	`if textSpan.Contains(span.Start)\|\| textSpan.Contains(span.End-1)\|\| span.Contains(textSpan)then`
`64`	`64`	`yield ClassifiedSpan(span, CommonHelpers.compilerTokenToRoslynToken(tokenColorKind))\|]`
`65`	`65`

Comments

(0)