Commit44af823

authored

Merge pull request #3102 from vasily-kirichenko/fix-exception-coloring

Color F# exceptions as ref types / fix coloring of backticked enum fields

2 parents11f2ae3 +c63ad2d commit44af823Copy full SHA for 44af823

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1231,6 +1231,8 @@ type TypeCheckInfo`
`1231`	`1231`	`if minfos\|> List.exists(fun minfo-> isStructTy g minfo.EnclosingType)then`
`1232`	`1232`	`Some(m, SemanticClassificationType.ValueType)`
`1233`	`1233`	`else Some(m, SemanticClassificationType.ReferenceType)`
	`1234`	`+\| CNR(_, Item.ExnCase_, LegitTypeOccurence,_,_,_, m)->`
	`1235`	`+ Some(m, SemanticClassificationType.ReferenceType)`
`1234`	`1236`	`\| CNR(_, Item.ModuleOrNamespaces refs, LegitTypeOccurence,_,_,_, m)when refs\|> List.exists(fun x-> x.IsModule)->`
`1235`	`1237`	`Some(m, SemanticClassificationType.Module)`
`1236`	`1238`	`\| CNR(_,(Item.ActivePatternCase_\| Item.UnionCase_\| Item.ActivePatternResult_),_,_,_,_, m)->`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -610,9 +610,15 @@ module internal Tokenizer =`
`610`	`610`	`/// Fix invalid span if it appears to have redundant suffix and prefix.`
`611`	`611`	`letfixupSpan(sourceText:SourceText,span:TextSpan):TextSpan=`
`612`	`612`	`lettext= sourceText.GetSubText(span).ToString()`
`613`		`-match text.LastIndexOf'.'with`
`614`		`-\|-1\|0-> span`
`615`		`-\| index-> TextSpan(span.Start+ index+1, text.Length- index-1)`
	`613`	`+// backticked ident`
	`614`	+if text.EndsWith"``"then
	`615`	+match text.[..text.Length-3].LastIndexOf"``"with
	`616`	`+\|-1\|0-> span`
	`617`	`+\| index-> TextSpan(span.Start+ index, text.Length- index)`
	`618`	`+else`
	`619`	`+match text.LastIndexOf'.'with`
	`620`	`+\|-1\|0-> span`
	`621`	`+\| index-> TextSpan(span.Start+ index+1, text.Length- index-1)`
`616`	`622`
`617`	`623`	`letisValidNameForSymbol(lexerSymbolKind:LexerSymbolKind,symbol:FSharpSymbol,name:string):bool=`
`618`	`624`	letdoubleBackTickDelimiter="``"

Comments

(0)