Commit5739335

authored and

committed

Fix a number of completion issues (dotnet#2398)

* remove `.. ..` operator from completion list* filter out operator members from completion list* do not show completion inside hash directives

1 parentdd334b2 commit5739335Copy full SHA for 5739335

File tree

+14

-5

lines changed

+14

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,8 @@ module internal Microsoft.FSharp.Compiler.PrettyNaming`
`135`	`135`	/// Returns `true` if given string is an operator display name, e.g. ( \|>> )
`136`	`136`	`letIsOperatorName(name:string)=`
`137`	`137`	`letname=if name.StartsWith"("&& name.EndsWith" )"then name.[2..name.Length-3]else name`
`138`		`-letres= name\|> Seq.forall(fun c-> opCharSet.Contains c&& c<>' ')`
	`138`	+// there is single operator containing a space - range operator with step: `.. ..`
	`139`	`+letres= name=".. .."\|\| name\|> Seq.forall(fun c-> opCharSet.Contains c&& c<>' ')`
`139`	`140`	`res`
`140`	`141`
`141`	`142`	`letIsMangledOpName(n:string)=`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1397,14 +1397,14 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[]) =`
`1397`	`1397`	`letisOperatorItem(name,item)=`
`1398`	`1398`	`match itemwith`
`1399`	`1399`	`\|[Item.Value_]`
`1400`		`-\|[Item.MethodGroup(_,[_],_)]-> IsOperatorName name`
	`1400`	`+\|[Item.MethodGroup_]-> IsOperatorName name`
`1401`	`1401`	`\|[Item.UnionCase_]-> IsOperatorName name`
`1402`	`1402`	`\|_->false`
`1403`	`1403`
`1404`	`1404`	`letisFSharpList name=(name="[]")// list shows up as a Type and a UnionCase, only such entity with a symbolic name, but want to filter out of intellisense`
`1405`	`1405`
`1406`	`1406`	`items\|> List.filter(fun(name,items)->not(isOperatorItem(name, items))&&not(isFSharpList name))`
`1407`		`-`
	`1407`	`+`
`1408`	`1408`	`letdecls=`
`1409`	`1409`	`// Filter out duplicate names`
`1410`	`1410`	`items\|> List.map(fun(nm,itemsWithSameName)->`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ module internal AstTraversal =`
`74`	`74`	`// VisitRecordField allows overriding behavior when visiting l.h.s. of constructed record instances`
`75`	`75`	`abstractVisitRecordField :TraversePathSynExproptionLongIdentWithDotsoption->'Toption`
`76`	`76`	`defaultthis.VisitRecordField(_path,_copyOpt,_recordField)= None`
	`77`	`+// VisitHashDirective allows overriding behavior when visiting hash directives in FSX scripts, like #r, #load and #I.`
	`78`	`+abstractVisitHashDirective :range->'Toption`
	`79`	`+defaultthis.VisitHashDirective(_)= None`
`77`	`80`
`78`	`81`	`letdive node range project=`
`79`	`82`	`range,(fun()-> project node)`
`@@ -143,7 +146,7 @@ module internal AstTraversal =`
`143`	`146`	`\| SynModuleDecl.Exception(_synExceptionDefn,_range)-> None`
`144`	`147`	`\| SynModuleDecl.Open(_longIdent,_range)-> None`
`145`	`148`	`\| SynModuleDecl.Attributes(_synAttributes,_range)-> None`
`146`		`-\| SynModuleDecl.HashDirective(_parsedHashDirective,_range)->None`
	`149`	`+\| SynModuleDecl.HashDirective(_parsedHashDirective,range)->visitor.VisitHashDirective range`
`147`	`150`	`\| SynModuleDecl.NamespaceFragment(synModuleOrNamespace)-> traverseSynModuleOrNamespace path synModuleOrNamespace`
`148`	`151`	`visitor.VisitModuleDecl(defaultTraverse, decl)`
`149`	`152`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1171,5 +1171,10 @@ module UntypedParseImpl =`
`1171`	`1171`	`\| None-> Some(CompletionContext.Invalid)// A $ .B -> no completion list`
`1172`	`1172`	`\|_-> None`
`1173`	`1173`
`1174`		`-memberthis.VisitBinding(defaultTraverse,synBinding)= defaultTraverse synBinding}`
	`1174`	`+memberthis.VisitBinding(defaultTraverse,synBinding)= defaultTraverse synBinding`
	`1175`	`+`
	`1176`	`+memberthis.VisitHashDirective(range)=`
	`1177`	`+if rangeContainsPos range posthen Some CompletionContext.Invalid`
	`1178`	`+else None}`
	`1179`	`+`
`1175`	`1180`	`AstTraversal.Traverse(pos, pt, walker)`

Comments

(0)