提交 e84d661f 编写于 作者: C CyrusNajmabadi

Get rid of forwarding methods.

上级 302d6dac
......@@ -151,7 +151,7 @@ private bool IsAfterNameEqualsArgument(SyntaxToken token)
select SymbolCompletionItem.CreateWithSymbolId(
displayText: p.Name.ToIdentifierToken().ToString() + SpaceEqualsString,
insertionText: null,
symbol: p,
symbols: ImmutableArray.Create(p),
contextPosition: token.SpanStart,
sortText: p.Name,
rules: _spaceItemFilterRule);
......@@ -171,7 +171,7 @@ private bool IsAfterNameEqualsArgument(SyntaxToken token)
select SymbolCompletionItem.CreateWithSymbolId(
displayText: p.Name.ToIdentifierToken().ToString() + ColonString,
insertionText: null,
symbol: p,
symbols: ImmutableArray.Create(p),
contextPosition: token.SpanStart,
sortText: p.Name,
rules: CompletionItemRules.Default);
......
......@@ -113,7 +113,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
var item = SymbolCompletionItem.CreateWithSymbolId(
displayText: displayText,
symbol: alias ?? type,
symbols: ImmutableArray.Create(alias ?? type),
rules: s_rules.WithMatchPriority(MatchPriority.Preselect),
contextPosition: position);
......
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
......@@ -99,7 +100,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
var item = SymbolCompletionItem.CreateWithSymbolId(
displayText,
insertionText: insertionText,
symbol: member,
symbols: ImmutableArray.Create(member),
contextPosition: position,
rules: CompletionItemRules.Default);
item = item.AddProperty(InsertionTextOnOpenParen, member.Name);
......
......@@ -97,7 +97,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
context.AddItem(SymbolCompletionItem.CreateWithSymbolId(
displayText: escapedName + ColonString,
symbol: parameter,
symbols: ImmutableArray.Create(parameter),
rules: s_rules.WithMatchPriority(SymbolMatchPriority.PreferNamedArgument),
contextPosition: token.SpanStart,
filterText: escapedName));
......
......@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
......@@ -64,7 +65,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
context.AddItem(SymbolCompletionItem.CreateWithSymbolId(
displayText: uninitializedMember.Name,
insertionText: null,
symbol: uninitializedMember,
symbols: ImmutableArray.Create(uninitializedMember),
contextPosition: initializerLocation.SourceSpan.Start,
rules: s_rules));
}
......
......@@ -56,7 +56,7 @@ public async sealed override Task ProvideCompletionsAsync(CompletionContext comp
return SymbolCompletionItem.CreateWithSymbolId(
displayText: displayAndInsertionText.Item1,
insertionText: displayAndInsertionText.Item2,
symbol: symbol,
symbols: ImmutableArray.Create(symbol),
contextPosition: context.Position,
properties: GetProperties(symbol, context),
rules: CompletionItemRules.Default);
......
......@@ -26,7 +26,7 @@ internal class MemberInsertionCompletionItem
return SymbolCompletionItem.CreateWithSymbolId(
displayText: displayText,
symbol: symbol,
symbols: ImmutableArray.Create(symbol),
glyph: glyph,
contextPosition: descriptionPosition,
properties: props,
......
......@@ -65,33 +65,6 @@ public static CompletionItem AddSymbolNameAndKind(IReadOnlyList<ISymbol> symbols
.AddProperty("SymbolName", symbol.Name);
}
private static CompletionItem CreateWorker(
string displayText,
ISymbol symbol,
CompletionItemRules rules,
Func<IReadOnlyList<ISymbol>, CompletionItem, CompletionItem> symbolEncoder,
int contextPosition = -1,
string sortText = null,
string insertionText = null,
Glyph? glyph = null,
string filterText = null,
SupportedPlatformData supportedPlatforms = null,
ImmutableDictionary<string, string> properties = null)
{
return CreateWorker(
displayText: displayText,
symbols: ImmutableArray.Create(symbol),
rules: rules,
symbolEncoder: symbolEncoder,
contextPosition: contextPosition,
sortText: sortText,
insertionText: insertionText,
glyph: glyph,
filterText: filterText,
supportedPlatforms: supportedPlatforms,
properties: properties);
}
public static string EncodeSymbols(IReadOnlyList<ISymbol> symbols)
{
if (symbols.Count > 1)
......@@ -286,24 +259,6 @@ public static string GetInsertionText(CompletionItem item)
filterText, supportedPlatforms, properties, tags);
}
public static CompletionItem CreateWithSymbolId(
string displayText,
ISymbol symbol,
CompletionItemRules rules,
int contextPosition,
string sortText = null,
string insertionText = null,
Glyph? glyph = null,
string filterText = null,
SupportedPlatformData supportedPlatforms = null,
ImmutableDictionary<string, string> properties = null)
{
return CreateWorker(
displayText, symbol, rules, AddSymbolEncoding,
contextPosition, sortText, insertionText, glyph,
filterText, supportedPlatforms, properties);
}
public static CompletionItem CreateWithNameAndKind(
string displayText,
IReadOnlyList<ISymbol> symbols,
......
......@@ -123,7 +123,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return SymbolCompletionItem.CreateWithSymbolId(
displayText:=displayAndInsertionText.Item1,
insertionText:=displayAndInsertionText.Item2,
symbol:=symbol,
symbols:=ImmutableArray.Create(symbol),
contextPosition:=context.Position,
rules:=CompletionItemRules.Default)
End Function
......
......@@ -69,7 +69,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
context.AddItem(SymbolCompletionItem.CreateWithSymbolId(
displayText:=parameter.Name & s_colonEquals,
insertionText:=parameter.Name.ToIdentifierToken().ToString() & s_colonEquals,
symbol:=parameter,
symbols:=ImmutableArray.Create(parameter),
contextPosition:=position,
rules:=s_itemRules))
Next
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册