Commitbe7a935

smoothdeveloper

authored and

KevinRansom

committed

escape member which needs backtick in the completion list (#2649)

* escape member which needs backtick in the completion list* code review formatting

1 parent76d28e8 commitbe7a935Copy full SHA for be7a935

File tree

1 file changed

+30

-9

lines changed

src/fsharp/vs
- ServiceDeclarations.fs

1 file changed

+30

-9

lines changed

`‎src/fsharp/vs/ServiceDeclarations.fs‎`

Lines changed: 30 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1365,8 +1365,18 @@ type FSharpAccessibility(a:Accessibility, ?isProtected) =`
`1365`	`1365`
`1366`	`1366`	`/// An intellisense declaration`
`1367`	`1367`	`[<Sealed>]`
`1368`		`-typeFSharpDeclarationListItem(name: string,nameInCode: string,fullName: string,glyph: FSharpGlyph,info,isAttribute: bool,accessibility: FSharpAccessibility option,`
`1369`		`- kind: CompletionItemKind, isOwnMember: bool, priority: int)=`
	`1368`	`+typeFSharpDeclarationListItem`
	`1369`	`+( name: string,`
	`1370`	`+ nameInCode: string,`
	`1371`	`+ fullName: string,`
	`1372`	`+ glyph: FSharpGlyph,`
	`1373`	`+ info,`
	`1374`	`+ isAttribute: bool,`
	`1375`	`+ accessibility: FSharpAccessibility option,`
	`1376`	`+ kind: CompletionItemKind,`
	`1377`	`+ isOwnMember: bool,`
	`1378`	`+ priority: int`
	`1379`	`+)=`
`1370`	`1380`
`1371`	`1381`	`let mutabledescriptionTextHolder:FSharpToolTipText<_>option= None`
`1372`	`1382`	`let mutabletask=null`
`@@ -1493,23 +1503,34 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[]) =`
`1493`	`1503`
`1494`	`1504`	`letdecls=`
`1495`	`1505`	`// Filter out duplicate names`
`1496`		`- items\|> List.map(fun(nm,itemsWithSameName)->`
	`1506`	`+ items\|> List.map(fun(name,itemsWithSameName)->`
`1497`	`1507`	`match itemsWithSameNamewith`
`1498`	`1508`	`\|[]-> failwith"Unexpected empty bag"`
`1499`	`1509`	`\| item::_as items->`
`1500`	`1510`	`letglyph= ItemDescriptionsImpl.GlyphOfItem(denv, item.Item)`
`1501`	`1511`	`letname,nameInCode=`
`1502`		`-ifnm.StartsWith"("&&nm.EndsWith" )"then`
`1503`		`-letcleanName=nm.[2..nm.Length-3]`
	`1512`	`+ifname.StartsWith"("&&name.EndsWith" )"then`
	`1513`	`+letcleanName=name.[2..name.Length-3]`
`1504`	`1514`	`cleanName,`
`1505`		-if IsOperatorName nmthen cleanNameelse"``"+ cleanName+"``"
`1506`		`-else nm, nm`
	`1515`	+if IsOperatorName namethen cleanNameelse"``"+ cleanName+"``"
	`1516`	`+else`
	`1517`	`+ name, Lexhelp.Keywords.QuoteIdentifierIfNeeded name`
`1507`	`1518`
`1508`	`1519`	`letfullName= ItemDescriptionsImpl.FullNameOfItem g item.Item`
`1509`	`1520`
`1510`	`1521`	`FSharpDeclarationListItem(`
`1511`		`- name, nameInCode, fullName, glyph, Choice1Of2(items, infoReader, m, denv, reactor, checkAlive),`
`1512`		`- ItemDescriptionsImpl.IsAttribute infoReader item.Item, getAccessibility item.Item, item.Kind, item.IsOwnMember, item.MinorPriority))`
	`1522`	`+ name,`
	`1523`	`+ nameInCode,`
	`1524`	`+ fullName,`
	`1525`	`+ glyph,`
	`1526`	`+ Choice1Of2(items, infoReader, m, denv, reactor, checkAlive),`
	`1527`	`+ ItemDescriptionsImpl.IsAttribute infoReader item.Item,`
	`1528`	`+ getAccessibility item.Item,`
	`1529`	`+ item.Kind,`
	`1530`	`+ item.IsOwnMember,`
	`1531`	`+ item.MinorPriority`
	`1532`	`+)`
	`1533`	`+)`
`1513`	`1534`
`1514`	`1535`	`new FSharpDeclarationListInfo(Array.ofList decls)`
`1515`	`1536`

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!

Commitbe7a935

File tree

1 file changed

1 file changed

`‎src/fsharp/vs/ServiceDeclarations.fs‎`

0 commit comments