Commitf64b3c5

Vasily Kirichenko

authored and

Vasily Kirichenko

committed

Merge remote-tracking branch 'origin/master' into nameof-operator

2 parentsbcec600 +4530cc5 commitf64b3c5Copy full SHA for f64b3c5

File tree

1 file changed

-7

lines changed

vsintegration/src/FSharp.Editor/Classification
- ClassificationDefinitions.fs

1 file changed

-7

lines changed

`‎vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs‎`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,16 +39,16 @@ module internal FSharpClassificationTypes =`
`39`	`39`	`\| SemanticClassificationType.Property-> Property`
`40`	`40`
`41`	`41`	`moduleinternalClassificationDefinitions=`
`42`		`-[<Export; Name(FSharpClassificationTypes.Function); BaseDefinition("identifier")>]`
	`42`	`+[<Export; Name(FSharpClassificationTypes.Function); BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)>]`
`43`	`43`	`letFSharpFunctionClassificationType:ClassificationTypeDefinition=null`
`44`	`44`
`45`		`-[<Export; Name(FSharpClassificationTypes.MutableVar); BaseDefinition("identifier")>]`
	`45`	`+[<Export; Name(FSharpClassificationTypes.MutableVar); BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)>]`
`46`	`46`	`letFSharpMutableVarClassificationType:ClassificationTypeDefinition=null`
`47`	`47`
`48`		`-[<Export; Name(FSharpClassificationTypes.Printf); BaseDefinition("identifier")>]`
	`48`	`+[<Export; Name(FSharpClassificationTypes.Printf); BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)>]`
`49`	`49`	`letFSharpPrintfClassificationType:ClassificationTypeDefinition=null`
`50`	`50`
`51`		`-[<Export; Name(FSharpClassificationTypes.Property); BaseDefinition("identifier")>]`
	`51`	`+[<Export; Name(FSharpClassificationTypes.Property); BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)>]`
`52`	`52`	`letFSharpPropertyClassificationType:ClassificationTypeDefinition=null`
`53`	`53`
`54`	`54`	`[<Export(typeof<EditorFormatDefinition>)>]`
`@@ -58,9 +58,8 @@ module internal ClassificationDefinitions =`
`58`	`58`	`[<Order(After= PredefinedClassificationTypeNames.Keyword)>]`
`59`	`59`	`typeinternalFSharpFunctionTypeFormat()as self=`
`60`	`60`	`inherit ClassificationFormatDefinition()`
`61`		`-`
	`61`	`+// Not setting any colors here, so it will inherit from "Plain Text" by default`
`62`	`62`	`do self.DisplayName<- SR.FSharpFunctionsOrMethodsClassificationType.Value`
`63`		`- self.ForegroundColor<- Nullable Colors.Black`
`64`	`63`
`65`	`64`	`[<Export(typeof<EditorFormatDefinition>)>]`
`66`	`65`	`[<ClassificationType(ClassificationTypeNames= FSharpClassificationTypes.MutableVar)>]`
`@@ -93,4 +92,3 @@ module internal ClassificationDefinitions =`
`93`	`92`	`inherit ClassificationFormatDefinition()`
`94`	`93`
`95`	`94`	`do self.DisplayName<- SR.FSharpPropertiesClassificationType.Value`
`96`		`- self.ForegroundColor<- Nullable Colors.Black`

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!

Commitf64b3c5

File tree

1 file changed

1 file changed

`‎vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs‎`

0 commit comments