Commit331dde6

authored and

committed

proper structs and interfaces colorization in editor (dotnet#2421)

1 parent6efa3b3 commit331dde6Copy full SHA for 331dde6

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -500,6 +500,7 @@ type SemanticClassificationType =`
`500`	`500`	`\| ComputationExpression`
`501`	`501`	`\| IntrinsicType`
`502`	`502`	`\| Enumeration`
	`503`	`+\| Interface`
`503`	`504`
`504`	`505`	`// A scope represents everything we get back from the typecheck of a file.`
`505`	`506`	`// It acts like an in-memory database about the file.`
`@@ -1487,6 +1488,10 @@ type TypeCheckInfo`
`1487`	`1488`	`// typevariables get colored as types when they occur in syntactic types custom builders, custom operations get colored as keywords`
`1488`	`1489`	`\| CNR(_, Item.Types(_,[OptionalArgumentAttribute]), LegitTypeOccurence,_,_,_,_)-> None`
`1489`	`1490`	`\| CNR(_, Item.CtorGroup(_,[MethInfo.FSMeth(_, OptionalArgumentAttribute,_,_)]), LegitTypeOccurence,_,_,_,_)-> None`
	`1491`	`+\| CNR(_, Item.Types(_, types), LegitTypeOccurence,_,_,_, m)when types\|> List.exists(isInterfaceTy g)->`
	`1492`	`+ Some(m, SemanticClassificationType.Interface)`
	`1493`	`+\| CNR(_, Item.Types(_, types), LegitTypeOccurence,_,_,_, m)when types\|> List.exists(isStructTy g)->`
	`1494`	`+ Some(m, SemanticClassificationType.ValueType)`
`1490`	`1495`	`\| CNR(_, Item.Types_, LegitTypeOccurence,_,_,_, m)->`
`1491`	`1496`	`Some(m, SemanticClassificationType.ReferenceType)`
`1492`	`1497`	`\| CNR(_,(Item.TypeVar_\| Item.UnqualifiedType_\| Item.CtorGroup_), LegitTypeOccurence,_,_,_, m)->`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ type internal SemanticClassificationType =`
`161`	`161`	`\| ComputationExpression`
`162`	`162`	`\| IntrinsicType`
`163`	`163`	`\| Enumeration`
	`164`	`+\| Interface`
`164`	`165`
`165`	`166`	`/// A handle to the results of CheckFileInProject.`
`166`	`167`	`[<Sealed>]`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,10 @@ module internal FSharpClassificationTypes =`
`24`	`24`	`let [<Literal>]Keyword= ClassificationTypeNames.Keyword`
`25`	`25`	`let [<Literal>]Enum= ClassificationTypeNames.EnumName`
`26`	`26`	`let [<Literal>]Property="FSharp.Property"`
	`27`	`+let [<Literal>]Interface= ClassificationTypeNames.InterfaceName`
`27`	`28`
`28`	`29`	`letgetClassificationTypeName=function`
`29`		`-\| SemanticClassificationType.ReferenceType`
	`30`	`+\| SemanticClassificationType.ReferenceType-> ReferenceType`
`30`	`31`	`\| SemanticClassificationType.Module-> Module`
`31`	`32`	`\| SemanticClassificationType.ValueType-> ValueType`
`32`	`33`	`\| SemanticClassificationType.Function-> Function`
`@@ -37,6 +38,7 @@ module internal FSharpClassificationTypes =`
`37`	`38`	`\| SemanticClassificationType.UnionCase`
`38`	`39`	`\| SemanticClassificationType.Enumeration-> Enum`
`39`	`40`	`\| SemanticClassificationType.Property-> Property`
	`41`	`+\| SemanticClassificationType.Interface-> Interface`
`40`	`42`
`41`	`43`	`moduleinternalClassificationDefinitions=`
`42`	`44`	`[<Export; Name(FSharpClassificationTypes.Function); BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)>]`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ type internal FSharpColorizationService`
`24`	`24`	`checkerProvider: FSharpCheckerProvider,`
`25`	`25`	`projectInfoManager: ProjectInfoManager`
`26`	`26`	`)=`
	`27`	`+`
`27`	`28`	`interface IEditorClassificationServicewith`
`28`	`29`	`// Do not perform classification if we don't have project options (#defines matter)`
`29`	`30`	`memberthis.AddLexicalClassifications(_:SourceText,_:TextSpan,_:List<ClassifiedSpan>,_:CancellationToken)=()`

Comments

(0)