Commit21f7fe6

committed

make getKindPriority inline

1 parent1732849 commit21f7fe6Copy full SHA for 21f7fe6

File tree

+13

-11

lines changed

vsintegration/src/FSharp.Editor/Completion
- CompletionProvider.fs
- CompletionUtils.fs

+13

-11

lines changed

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,21 +121,12 @@ type internal FSharpCompletionProvider`
`121`	`121`	`partialName, getAllSymbols, userOpName=userOpName)\|> liftAsync`
`122`	`122`	`letresults= List<Completion.CompletionItem>()`
`123`	`123`
`124`		`-letgetKindPriority=function`
`125`		`-\| CompletionItemKind.Property->0`
`126`		`-\| CompletionItemKind.Field->1`
`127`		`-\| CompletionItemKind.Method(isExtension=false)->2`
`128`		`-\| CompletionItemKind.Event->3`
`129`		`-\| CompletionItemKind.Argument->4`
`130`		`-\| CompletionItemKind.Other->5`
`131`		`-\| CompletionItemKind.Method(isExtension=true)->6`
`132`		`-`
`133`	`124`	`declarationItems<-`
`134`	`125`	`declarations.Items`
`135`	`126`	`\|> Array.sortWith(fun x y->`
`136`	`127`	`let mutablen=(not x.IsResolved).CompareTo(not y.IsResolved)`
`137`	`128`	`if n<>0then nelse`
`138`		`- n<-(getKindPriority x.Kind).CompareTo(getKindPriority y.Kind)`
	`129`	`+ n<-(CompletionUtils.getKindPriority x.Kind).CompareTo(CompletionUtils.getKindPriority y.Kind)`
`139`	`130`	`if n<>0then nelse`
`140`	`131`	`n<-(not x.IsOwnMember).CompareTo(not y.IsOwnMember)`
`141`	`132`	`if n<>0then nelse`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ open Microsoft.CodeAnalysis.Classification`
`9`	`9`	`openMicrosoft.CodeAnalysis.Text`
`10`	`10`	`openMicrosoft.CodeAnalysis.Completion`
`11`	`11`	`openSystem.Globalization`
	`12`	`+openMicrosoft.FSharp.Compiler.SourceCodeServices`
`12`	`13`
`13`	`14`	`moduleinternalCompletionUtils=`
`14`	`15`
`@@ -97,4 +98,14 @@ module internal CompletionUtils =`
`97`	`98`	`\| ClassificationTypeNames.Operator`
`98`	`99`	`\| ClassificationTypeNames.NumericLiteral->false`
`99`	`100`	`\|_->true// anything else is a valid classification type`
`100`		`-))`
	`101`	`+))`
	`102`	`+`
	`103`	`+let inlinegetKindPriority kind=`
	`104`	`+match kindwith`
	`105`	`+\| CompletionItemKind.Property->0`
	`106`	`+\| CompletionItemKind.Field->1`
	`107`	`+\| CompletionItemKind.Method(isExtension=false)->2`
	`108`	`+\| CompletionItemKind.Event->3`
	`109`	`+\| CompletionItemKind.Argument->4`
	`110`	`+\| CompletionItemKind.Other->5`
	`111`	`+\| CompletionItemKind.Method(isExtension=true)->6`

Comments

(0)