提交 8c93bb82 编写于 作者: C CyrusNajmabadi

Simplify insertion code.

上级 f1c8c971
...@@ -75,9 +75,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers ...@@ -75,9 +75,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Public Function GetDisplayAndInsertionText( Public Function GetDisplayAndInsertionText(
symbol As ISymbol, symbol As ISymbol,
isAttributeNameContext As Boolean, isAfterDot As Boolean, isWithinAsyncMethod As Boolean, context As AbstractSyntaxContext) As ValueTuple(Of String, String)
syntaxFacts As ISyntaxFactsService
) As ValueTuple(Of String, String) Dim isAttributeNameContext = context.IsAttributeNameContext
Dim isAfterDot = context.IsRightOfNameSeparator
Dim isWithinAsyncMethod = context.IsWithinAsyncMethod
Dim syntaxFacts = context.GetLanguageService(Of ISyntaxFactsService)()
Dim name As String = Nothing Dim name As String = Nothing
If Not CommonCompletionUtilities.TryRemoveAttributeSuffix(symbol, isAttributeNameContext, syntaxFacts, name) Then If Not CommonCompletionUtilities.TryRemoveAttributeSuffix(symbol, isAttributeNameContext, syntaxFacts, name) Then
......
...@@ -97,12 +97,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers ...@@ -97,12 +97,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return ValueTuple.Create(text, text) Return ValueTuple.Create(text, text)
End If End If
Dim result = CompletionUtilities.GetDisplayAndInsertionText(symbol, Return CompletionUtilities.GetDisplayAndInsertionText(symbol, context)
context.IsAttributeNameContext,
context.IsRightOfNameSeparator,
context.IsWithinAsyncMethod,
context.GetLanguageService(Of ISyntaxFactsService)())
Return result
End Function End Function
Protected Overrides Async Function CreateContext(document As Document, position As Integer, cancellationToken As CancellationToken) As Task(Of AbstractSyntaxContext) Protected Overrides Async Function CreateContext(document As Document, position As Integer, cancellationToken As CancellationToken) As Task(Of AbstractSyntaxContext)
......
...@@ -112,8 +112,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers ...@@ -112,8 +112,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
symbol As ISymbol, symbol As ISymbol,
context As AbstractSyntaxContext) As CompletionItem context As AbstractSyntaxContext) As CompletionItem
Dim displayAndInsertionText = CompletionUtilities.GetDisplayAndInsertionText( Dim displayAndInsertionText = CompletionUtilities.GetDisplayAndInsertionText(symbol, context)
symbol, isAttributeNameContext:=False, isAfterDot:=context.IsRightOfNameSeparator, isWithinAsyncMethod:=context.IsWithinAsyncMethod, syntaxFacts:=context.GetLanguageService(Of ISyntaxFactsService)())
Return SymbolCompletionItem.Create( Return SymbolCompletionItem.Create(
displayText:=displayAndInsertionText.Item1, displayText:=displayAndInsertionText.Item1,
...@@ -132,11 +131,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers ...@@ -132,11 +131,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return False Return False
End Function End Function
Protected Overrides Function GetDisplayAndInsertionText(symbol As ISymbol, Protected Overrides Function GetDisplayAndInsertionText(
context As AbstractSyntaxContext) As ValueTuple(Of String, String) symbol As ISymbol, context As AbstractSyntaxContext) As ValueTuple(Of String, String)
Return CompletionUtilities.GetDisplayAndInsertionText( Return CompletionUtilities.GetDisplayAndInsertionText(symbol, context)
symbol, context.IsAttributeNameContext, context.IsRightOfNameSeparator, isWithinAsyncMethod:=context.IsWithinAsyncMethod, syntaxFacts:=context.GetLanguageService(Of ISyntaxFactsService))
End Function End Function
Protected Overrides Async Function CreateContext(document As Document, position As Integer, cancellationToken As CancellationToken) As Task(Of AbstractSyntaxContext) Protected Overrides Async Function CreateContext(document As Document, position As Integer, cancellationToken As CancellationToken) As Task(Of AbstractSyntaxContext)
......
...@@ -251,10 +251,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers ...@@ -251,10 +251,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
displayText = symbol.ToMinimalDisplayString(context.SemanticModel, context.Position) displayText = symbol.ToMinimalDisplayString(context.SemanticModel, context.Position)
insertionText = displayText insertionText = displayText
Else Else
Dim displayAndInsertionText = CompletionUtilities.GetDisplayAndInsertionText( Dim displayAndInsertionText = CompletionUtilities.GetDisplayAndInsertionText(symbol, context)
symbol, isAttributeNameContext:=False, isAfterDot:=context.IsRightOfNameSeparator,
isWithinAsyncMethod:=False,
syntaxFacts:=context.GetLanguageService(Of ISyntaxFactsService)())
displayText = displayAndInsertionText.Item1 displayText = displayAndInsertionText.Item1
insertionText = displayAndInsertionText.Item2 insertionText = displayAndInsertionText.Item2
......
...@@ -62,8 +62,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers ...@@ -62,8 +62,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
End Function End Function
Protected Overrides Function GetDisplayAndInsertionText(symbol As ISymbol, context As AbstractSyntaxContext) As ValueTuple(Of String, String) Protected Overrides Function GetDisplayAndInsertionText(symbol As ISymbol, context As AbstractSyntaxContext) As ValueTuple(Of String, String)
Return CompletionUtilities.GetDisplayAndInsertionText( Return CompletionUtilities.GetDisplayAndInsertionText(symbol, context)
symbol, context.IsAttributeNameContext, context.IsRightOfNameSeparator, context.IsWithinAsyncMethod, context.GetLanguageService(Of ISyntaxFactsService))
End Function End Function
Protected Overrides Async Function CreateContext(document As Document, position As Integer, cancellationToken As CancellationToken) As Task(Of AbstractSyntaxContext) Protected Overrides Async Function CreateContext(document As Document, position As Integer, cancellationToken As CancellationToken) As Task(Of AbstractSyntaxContext)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册