Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit81c4144

Browse files
authored
Merge pull requestdotnet#4730 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parentsda5a6ec +d4920e0 commit81c4144

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

‎vsintegration/src/FSharp.Editor/Common/Vs.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,4 @@ module internal ServiceProviderExtensions =
8888

8989
membersp.TextManager= sp.GetService<SVsTextManager, IVsTextManager>()
9090
membersp.RunningDocumentTable= sp.GetService<SVsRunningDocumentTable, IVsRunningDocumentTable>()
91-
membersp.XmlService= sp.GetService<SVsXMLMemberIndexService, IVsXMLMemberIndexService>()
92-
membersp.DTE= sp.GetService<SDTE, EnvDTE.DTE>()
91+
membersp.XMLMemberIndexService= sp.GetService<SVsXMLMemberIndexService, IVsXMLMemberIndexService>()

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ type internal FSharpCompletionProvider
5353

5454
letchecker= checkerProvider.Checker
5555

56-
letxmlMemberIndexService= serviceProvider.GetService(typeof<IVsXMLMemberIndexService>):?> IVsXMLMemberIndexService
57-
letdocumentationBuilder= XmlDocumentation.CreateDocumentationBuilder(xmlMemberIndexService, serviceProvider.DTE)
56+
letdocumentationBuilder= XmlDocumentation.CreateDocumentationBuilder(serviceProvider.XMLMemberIndexService)
5857

5958
static letnoCommitOnSpaceRules=
6059
// These are important. They make sure we don't _commit_ autocompletion when people don't expect them to. Some examples:

‎vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ type internal FSharpSignatureHelpProvider
2929
)=
3030

3131
static letuserOpName="SignatureHelpProvider"
32-
letxmlMemberIndexService= serviceProvider.GetService(typeof<IVsXMLMemberIndexService>):?> IVsXMLMemberIndexService
33-
letdocumentationBuilder= XmlDocumentation.CreateDocumentationBuilder(xmlMemberIndexService, serviceProvider.DTE)
32+
letdocumentationBuilder= XmlDocumentation.CreateDocumentationBuilder(serviceProvider.XMLMemberIndexService)
3433

3534
static letoneColAfter(lp:LinePosition)= LinePosition(lp.Line,lp.Character+1)
3635
static letoneColBefore(lp:LinePosition)= LinePosition(lp.Line,max0(lp.Character-1))

‎vsintegration/src/FSharp.Editor/DocComments/XMLDocumentation.fs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ open System.Runtime.CompilerServices
77
openSystem.Runtime.Caching
88
openSystem.Text.RegularExpressions
99
openInternal.Utilities.Collections
10-
openEnvDTE
11-
openEnvDTE80
10+
openMicrosoft.VisualStudio.Shell
1211
openMicrosoft.VisualStudio.Shell.Interop
1312
openMicrosoft.FSharp.Compiler.SourceCodeServices
1413
openMicrosoft.FSharp.Compiler.Layout
@@ -214,13 +213,11 @@ module internal XmlDocumentation =
214213
letvsToken= VsThreadToken()
215214

216215
/// Provide Xml Documentation
217-
typeProvider(xmlIndexService:IVsXMLMemberIndexService,dte: DTE)=
216+
typeProvider(xmlIndexService:IVsXMLMemberIndexService)=
218217
/// Index of assembly name to xml member index.
219218
let mutablexmlCache=new AgedLookup<VsThreadToken,string,IVsXMLMemberIndex>(10,areSimilar=(fun(x,y)-> x= y))
220219

221-
letevents= dte.Events:?> Events2
222-
letsolutionEvents= events.SolutionEvents
223-
do solutionEvents.add_AfterClosing(fun()->
220+
do Events.SolutionEvents.OnAfterCloseSolution.Add(fun _->
224221
xmlCache.Clear(vsToken))
225222

226223
#if DEBUG// Keep under DEBUG so that it can keep building.
@@ -239,7 +236,7 @@ module internal XmlDocumentation =
239236
collector.Add(tagText text)
240237

241238
let_AppendRemarks(collector:ITaggedTextCollector)(memberData:IVsXMLMemberData3)=
242-
letok,remarksText= memberData.GetRemarksText()
239+
letok,remarksText= memberData.GetRemarksText()
243240
if Com.Succeeded(ok)then
244241
AppendOnNewLine collector remarksText
245242
#endif
@@ -416,5 +413,5 @@ module internal XmlDocumentation =
416413
AppendXmlComment(documentationProvider, TextSanitizingCollector(xmlCollector), TextSanitizingCollector(xmlCollector), xml,false,true, Some paramName)
417414

418415
letdocumentationBuilderCache= ConditionalWeakTable<IVsXMLMemberIndexService, IDocumentationBuilder>()
419-
letCreateDocumentationBuilder(xmlIndexService:IVsXMLMemberIndexService,dte:DTE)=
420-
documentationBuilderCache.GetValue(xmlIndexService,(fun _-> Provider(xmlIndexService, dte):> IDocumentationBuilder))
416+
letCreateDocumentationBuilder(xmlIndexService:IVsXMLMemberIndexService)=
417+
documentationBuilderCache.GetValue(xmlIndexService,(fun _-> Provider(xmlIndexService):> IDocumentationBuilder))

‎vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ module private FSharpQuickInfo =
159159

160160
typeinternalFSharpAsyncQuickInfoSource
161161
(
162-
serviceProvider:IServiceProvider,
162+
xmlMemberIndexService: IVsXMLMemberIndexService,
163163
checkerProvider:FSharpCheckerProvider,
164164
projectInfoManager:FSharpProjectOptionsManager,
165165
gotoDefinitionService:FSharpGoToDefinitionService,
@@ -192,8 +192,7 @@ type internal FSharpAsyncQuickInfoSource
192192
|false-> Task.FromResult<QuickInfoItem>(null)
193193
|true->
194194
lettriggerPoint= triggerPoint.GetValueOrDefault()
195-
letxmlMemberIndexService= serviceProvider.GetService(typeof<SVsXMLMemberIndexService>):?> IVsXMLMemberIndexService
196-
letdocumentationBuilder= XmlDocumentation.CreateDocumentationBuilder(xmlMemberIndexService, serviceProvider.DTE)
195+
letdocumentationBuilder= XmlDocumentation.CreateDocumentationBuilder(xmlMemberIndexService)
197196
asyncMaybe{
198197
letdocument= textBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges()
199198
let!symbolUse,sigQuickInfo,targetQuickInfo= FSharpQuickInfo.getQuickInfo(checkerProvider.Checker, projectInfoManager, document, triggerPoint.Position, cancellationToken)
@@ -263,4 +262,5 @@ type internal FSharpAsyncQuickInfoSourceProvider
263262
gotoDefinitionService:FSharpGoToDefinitionService
264263
)=
265264
interface IAsyncQuickInfoSourceProviderwith
266-
override__.TryCreateQuickInfoSource(textBuffer:ITextBuffer):IAsyncQuickInfoSource=new FSharpAsyncQuickInfoSource(serviceProvider, checkerProvider, projectInfoManager, gotoDefinitionService, textBuffer):> IAsyncQuickInfoSource
265+
override__.TryCreateQuickInfoSource(textBuffer:ITextBuffer):IAsyncQuickInfoSource=
266+
new FSharpAsyncQuickInfoSource(serviceProvider.XMLMemberIndexService, checkerProvider, projectInfoManager, gotoDefinitionService, textBuffer):> IAsyncQuickInfoSource

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp