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

Commit25da584

Browse files
committed
Merge remote-tracking branch 'upstream/dev16.0' into merges/master-to-dev16.0
2 parents3365d2d +fdff76d commit25da584

File tree

29 files changed

+164
-157
lines changed

29 files changed

+164
-157
lines changed

‎vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type internal FSharpClassificationService
4747
asyncMaybe{
4848
use _logBlock= Logger.LogBlock(LogEditorFunctionId.Classification_Semantic)
4949

50-
let!_,_,projectOptions= projectInfoManager.TryGetOptionsForDocumentOrProject(document)
50+
let!_,_,projectOptions= projectInfoManager.TryGetOptionsForDocumentOrProject(document, cancellationToken)
5151
let!sourceText= document.GetTextAsync(cancellationToken)
5252
let!_,_,checkResults= checkerProvider.Checker.ParseAndCheckDocument(document, projectOptions, sourceText= sourceText, allowStaleResults=false, userOpName=userOpName)
5353
// it's crucial to not return duplicated or overlapping `ClassifiedSpan`s because Find Usages service crashes.

‎vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ type internal FSharpAddOpenCodeFixProvider
9696
override__.RegisterCodeFixesAsync context:Task=
9797
asyncMaybe{
9898
letdocument= context.Document
99-
let!parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProjectdocument
99+
let!parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, context.CancellationToken)
100100
let!sourceText= context.Document.GetTextAsync(context.CancellationToken)
101101
let!_,parsedInput,checkResults= checker.ParseAndCheckDocument(document, projectOptions, sourceText= sourceText, userOpName= userOpName)
102102
letline= sourceText.Lines.GetLineFromPosition(context.Span.End)

‎vsintegration/src/FSharp.Editor/CodeFix/ImplementInterfaceCodeFixProvider.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ type internal FSharpImplementInterfaceCodeFixProvider
138138

139139
override__.RegisterCodeFixesAsync context:Task=
140140
asyncMaybe{
141-
let!parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProjectcontext.Document
141+
let!parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(context.Document, context.CancellationToken)
142142
letcancellationToken= context.CancellationToken
143143
let!sourceText= context.Document.GetTextAsync(cancellationToken)
144144
let!_,parsedInput,checkFileResults= checker.ParseAndCheckDocument(context.Document, projectOptions, sourceText= sourceText, userOpName= userOpName)

‎vsintegration/src/FSharp.Editor/CodeFix/RemoveUnusedOpens.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type internal FSharpRemoveUnusedOpensCodeFixProvider
3232
letdocument= context.Document
3333
let!sourceText= document.GetTextAsync()
3434
letchecker= checkerProvider.Checker
35-
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
35+
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, context.CancellationToken)
3636
let!unusedOpens= UnusedOpensDiagnosticAnalyzer.GetUnusedOpenRanges(document, projectOptions, checker)
3737
letchanges=
3838
unusedOpens

‎vsintegration/src/FSharp.Editor/CodeFix/RenameUnusedValue.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type internal FSharpRenameUnusedValueCodeFixProvider
5757
// We have to use the additional check for backtickes because `IsOperatorOrBacktickedName` operates on display names
5858
// where backtickes are replaced with parens.
5959
ifnot(PrettyNaming.IsOperatorOrBacktickedName ident)&&not(ident.StartsWith"``")then
60-
let!parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProjectdocument
60+
let!parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, context.CancellationToken)
6161
let!_,_,checkResults= checker.ParseAndCheckDocument(document, projectOptions, sourceText= sourceText, userOpName=userOpName)
6262
letm= RoslynHelpers.TextSpanToFSharpRange(document.FilePath, context.Span, sourceText)
6363
letdefines= CompilerEnvironment.GetCompilationDefinesForEditing parsingOptions

‎vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ type internal FSharpCodeLensService
142142
do! Async.Sleep800|> liftAsync
143143
logInfof"Rechecking code due to buffer edit!"
144144
let!document= workspace.CurrentSolution.GetDocument(documentId.Value)|> Option.ofObj
145-
let!_,options= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
145+
let!_,options= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, bufferChangedCts.Token)
146146
let!_,parsedInput,checkFileResults= checker.ParseAndCheckDocument(document, options,"LineLens", allowStaleResults=true)
147147
logInfof"Getting uses of all symbols!"
148148
let!symbolUses= checkFileResults.GetAllUsesOfAllSymbolsInFile()|> liftAsync

‎vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ type internal FSharpHelpContextService
9999

100100
memberthis.GetHelpTermAsync(document,textSpan,cancellationToken)=
101101
asyncMaybe{
102-
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
102+
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, cancellationToken)
103103
let!sourceText= document.GetTextAsync(cancellationToken)
104104
let!textVersion= document.GetTextVersionAsync(cancellationToken)
105105
letdefines= projectInfoManager.GetCompilationDefinesForEditingDocument(document)

‎vsintegration/src/FSharp.Editor/Commands/XmlDocCommandService.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
55
openSystem
66
openSystem.ComponentModel.Composition
77
openSystem.Runtime.InteropServices
8+
openSystem.Threading
89

910
openMicrosoft.VisualStudio
1011
openMicrosoft.VisualStudio.Editor
@@ -66,7 +67,7 @@ type internal XmlDocCommandFilter
6667
// XmlDocable line #1 are 1-based, editor is 0-based
6768
letcurLineNum= wpfTextView.Caret.Position.BufferPosition.GetContainingLine().LineNumber+1
6869
let!document= document.Value
69-
let!parsingOptions,_options= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
70+
let!parsingOptions,_options= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, CancellationToken.None)
7071
letsourceText= wpfTextView.TextBuffer.CurrentSnapshot.GetText()
7172
let!parsedInput= checker.ParseDocument(document, parsingOptions, sourceText, userOpName)
7273
letxmlDocables= XmlDocParser.getXmlDocables(sourceText, Some parsedInput)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ type internal FSharpCompletionProvider
218218
let!sourceText= context.Document.GetTextAsync(context.CancellationToken)
219219
letdefines= projectInfoManager.GetCompilationDefinesForEditingDocument(document)
220220
do! Option.guard(CompletionUtils.shouldProvideCompletion(document.Id, document.FilePath, defines, sourceText, context.Position))
221-
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
221+
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, context.CancellationToken)
222222
let!textVersion= context.Document.GetTextVersionAsync(context.CancellationToken)
223223
letgetAllSymbols(fileCheckResults:FSharpCheckFileResults)=
224224
if settings.IntelliSense.IncludeSymbolsFromUnopenedNamespacesOrModules
@@ -284,7 +284,7 @@ type internal FSharpCompletionProvider
284284
let!sourceText= document.GetTextAsync(cancellationToken)
285285
lettextWithItemCommitted= sourceText.WithChanges(TextChange(item.Span, nameInCode))
286286
letline= sourceText.Lines.GetLineFromPosition(item.Span.Start)
287-
let!parsingOptions,_options= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
287+
let!parsingOptions,_options= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, cancellationToken)
288288
let!parsedInput= checker.ParseDocument(document, parsingOptions, sourceText, userOpName)
289289
letfullNameIdents= fullName|> Option.map(fun x-> x.Split'.')|> Option.defaultValue[||]
290290

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ type internal FSharpSignatureHelpProvider
195195
memberthis.GetItemsAsync(document,position,triggerInfo,cancellationToken)=
196196
asyncMaybe{
197197
try
198-
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
198+
let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, cancellationToken)
199199
let!sourceText= document.GetTextAsync(cancellationToken)
200200
let!textVersion= document.GetTextVersionAsync(cancellationToken)
201201

0 commit comments

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