Commitb1a5c68

dsyme

authored and

KevinRansom

committed

Fixdotnet#4714 (save completion data for at least as long as the completion session) (dotnet#4809)

* extend sliding window for intellisense completion to 2 minutes* save declaration items for at least as long as the completion session* save declaration items for at least as long as the completion session* save declaration items for at least as long as the completion session* save declaration items for at least as long as the completion session

1 parent19d4532 commitb1a5c68Copy full SHA for b1a5c68

File tree

1 file changed

+10

-8

lines changed

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

1 file changed

+10

-8

lines changed

`‎vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs‎`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ open Microsoft.FSharp.Compiler`
`21`	`21`	`openMicrosoft.FSharp.Compiler.Range`
`22`	`22`	`openMicrosoft.FSharp.Compiler.SourceCodeServices`
`23`	`23`	`openSystem.Runtime.Caching`
	`24`	`+openSystem.Collections.Concurrent`
`24`	`25`
`25`	`26`	`typeinternalFSharpCompletionProvider`
`26`	`27`	`(`
`@@ -34,8 +35,9 @@ type internal FSharpCompletionProvider`
`34`	`35`	`inherit CompletionProvider()`
`35`	`36`
`36`	`37`	`static letuserOpName="CompletionProvider"`
`37`		`-// Save the backing data in a memory cache held in a sliding window`
`38`		`-static letdeclarationItemsCache=new MemoryCache("FSharp.Editor."+ userOpName)`
	`38`	`+// Save the backing data in a cache, we need to save for at least the length of the completion session`
	`39`	`+// See https://github.com/Microsoft/visualfsharp/issues/4714`
	`40`	`+static letdeclarationItemsData=new ConcurrentDictionary<string, FSharpDeclarationListItem>()`
`39`	`41`	`static let [<Literal>]NameInCodePropName="NameInCode"`
`40`	`42`	`static let [<Literal>]FullNamePropName="FullName"`
`41`	`43`	`static let [<Literal>]IsExtensionMemberPropName="IsExtensionMember"`
`@@ -139,6 +141,7 @@ type internal FSharpCompletionProvider`
`139`	`141`
`140`	`142`	`letmaxHints=if mruItems.Values.Count=0then0else Seq.max mruItems.Values`
`141`	`143`
	`144`	`+ declarationItemsData.Clear()`
`142`	`145`	`sortedDeclItems\|> Array.iteri(fun number declarationItem->`
`143`	`146`	`letglyph= Tokenizer.FSharpGlyphToRoslynGlyph(declarationItem.Glyph, declarationItem.Accessibility)`
`144`	`147`	`letname=`
`@@ -184,9 +187,7 @@ type internal FSharpCompletionProvider`
`184`	`187`	`letcompletionItem= completionItem.WithSortText(sortText)`
`185`	`188`
`186`	`189`	`letkey= completionItem.DisplayText`
`187`		`-letcacheItem= CacheItem(key, declarationItem)`
`188`		`-letpolicy= CacheItemPolicy(SlidingExpiration=DefaultTuning.PerDocumentSavedDataSlidingWindow)`
`189`		`- declarationItemsCache.Set(cacheItem, policy)`
	`190`	`+ declarationItemsData.TryAdd(key, declarationItem)\|> ignore`
`190`	`191`	`results.Add(completionItem))`
`191`	`192`
`192`	`193`	`if results.Count>0&&not declarations.IsForType&&not declarations.IsError&& List.isEmpty partialName.QualifyingIdentsthen`
`@@ -212,7 +213,7 @@ type internal FSharpCompletionProvider`
`212`	`213`	`(documentId, document.FilePath, defines)`
`213`	`214`
`214`	`215`	`FSharpCompletionProvider.ShouldTriggerCompletionAux(sourceText, caretPosition, trigger.Kind, getInfo)`
`215`		`-`
	`216`	`+`
`216`	`217`	`overridethis.ProvideCompletionsAsync(context:Completion.CompletionContext)=`
`217`	`218`	`asyncMaybe{`
`218`	`219`	`letdocument= context.Document`
`@@ -228,13 +229,14 @@ type internal FSharpCompletionProvider`
`228`	`229`	`let!results=`
`229`	`230`	`FSharpCompletionProvider.ProvideCompletionsAsyncAux(checker, sourceText, context.Position, projectOptions,`
`230`	`231`	`document.FilePath, textVersion.GetHashCode(), getAllSymbols)`
	`232`	`+`
`231`	`233`	`context.AddItems(results)`
`232`	`234`	`}\|> Async.Ignore\|> RoslynHelpers.StartAsyncUnitAsTask context.CancellationToken`
`233`	`235`
`234`	`236`	`overridethis.GetDescriptionAsync(_:Document,completionItem:Completion.CompletionItem,cancellationToken:CancellationToken):Task<CompletionDescription>=`
`235`	`237`	`async{`
`236`		`-matchdeclarationItemsCache.Get(completionItem.DisplayText)with`
`237`		`-\|:? FSharpDeclarationListItem as declarationItem->`
	`238`	`+matchdeclarationItemsData.TryGetValue(completionItem.DisplayText)with`
	`239`	`+\|true, declarationItem->`
`238`	`240`	`let!description= declarationItem.StructuredDescriptionTextAsync`
`239`	`241`	`letdocumentation= List()`
`240`	`242`	`letcollector= RoslynHelpers.CollectTaggedText documentation`

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!

Commitb1a5c68

File tree

1 file changed

1 file changed

`‎vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs‎`

0 commit comments