Skip to content

Commit 4f11099

Browse files
authored
Update vs typeprovider tests (#10627)
1 parent 43efdf2 commit 4f11099

File tree

6 files changed

+14870
-3333
lines changed

6 files changed

+14870
-3333
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,19 @@ type internal FSharpCompletionProvider
107107

108108
static member ProvideCompletionsAsyncAux(checker: FSharpChecker, sourceText: SourceText, caretPosition: int, options: FSharpProjectOptions, filePath: string,
109109
textVersionHash: int, getAllSymbols: FSharpCheckFileResults -> AssemblySymbol list, languageServicePerformanceOptions: LanguageServicePerformanceOptions, intellisenseOptions: IntelliSenseOptions) =
110+
110111
asyncMaybe {
111112
let! parseResults, _, checkFileResults = checker.ParseAndCheckDocument(filePath, textVersionHash, sourceText, options, languageServicePerformanceOptions, userOpName = userOpName)
112-
113113
let textLines = sourceText.Lines
114114
let caretLinePos = textLines.GetLinePosition(caretPosition)
115115
let caretLine = textLines.GetLineFromPosition(caretPosition)
116116
let fcsCaretLineNumber = Line.fromZ caretLinePos.Line // Roslyn line numbers are zero-based, FSharp.Compiler.Service line numbers are 1-based
117117
let caretLineColumn = caretLinePos.Character
118118
let partialName = QuickParse.GetPartialLongNameEx(caretLine.ToString(), caretLineColumn - 1)
119-
120119
let getAllSymbols() =
121120
getAllSymbols checkFileResults
122-
|> List.filter (fun assemblySymbol ->
121+
|> List.filter (fun assemblySymbol ->
123122
assemblySymbol.FullName.Contains "." && not (PrettyNaming.IsOperatorName assemblySymbol.Symbol.DisplayName))
124-
125123
let declarations = checkFileResults.GetDeclarationListInfo(Some(parseResults), fcsCaretLineNumber, caretLine.ToString(),
126124
partialName, getAllSymbols)
127125
let results = List<Completion.CompletionItem>()
@@ -223,7 +221,6 @@ type internal FSharpCompletionProvider
223221
override _.ProvideCompletionsAsync(context: Completion.CompletionContext) =
224222
asyncMaybe {
225223
use _logBlock = Logger.LogBlockMessage context.Document.Name LogEditorFunctionId.Completion_ProvideCompletionsAsync
226-
227224
let document = context.Document
228225
let! sourceText = context.Document.GetTextAsync(context.CancellationToken)
229226
let defines = projectInfoManager.GetCompilationDefinesForEditingDocument(document)
@@ -237,10 +234,9 @@ type internal FSharpCompletionProvider
237234
let! results =
238235
FSharpCompletionProvider.ProvideCompletionsAsyncAux(checker, sourceText, context.Position, projectOptions, document.FilePath,
239236
textVersion.GetHashCode(), getAllSymbols, settings.LanguageServicePerformance, settings.IntelliSense)
240-
241237
context.AddItems(results)
242238
} |> Async.Ignore |> RoslynHelpers.StartAsyncUnitAsTask context.CancellationToken
243-
239+
244240
override _.GetDescriptionAsync(document: Document, completionItem: Completion.CompletionItem, cancellationToken: CancellationToken): Task<CompletionDescription> =
245241
async {
246242
use _logBlock = Logger.LogBlockMessage document.Name LogEditorFunctionId.Completion_GetDescriptionAsync

0 commit comments

Comments
 (0)