Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 3da6c8a6 编写于 作者: C CyrusNajmabadi
浏览文件
操作

Order FullyQualify results in the same order as Add-Import

上级 e49822fd
隐藏空白更改
内联 并排
Showing with 91 addition and 92 deletion
src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.Reference.cs
浏览文件 @ 3da6c8a6
// 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;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeActions;
......
src/Features/Core/Portable/CodeFixes/Qualify/AbstractFullyQualifyCodeFixProvider.SymbolResult.cs 0 → 100644
浏览文件 @ 3da6c8a6
// 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;
using System.Collections.Generic;
using Microsoft.CodeAnalysis.Shared.Extensions;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.CodeFixes.FullyQualify
{
internal abstract partial class AbstractFullyQualifyCodeFixProvider : CodeFixProvider
{
private struct SymbolResult : IEquatable<SymbolResult>, IComparable<SymbolResult>
{
public readonly INamespaceOrTypeSymbol Symbol;
public readonly int Weight;
public readonly IReadOnlyList<string> NameParts;
public SymbolResult(INamespaceOrTypeSymbol symbol, int weight)
{
Symbol = symbol;
Weight = weight;
NameParts = INamespaceOrTypeSymbolExtensions.GetNameParts(symbol);
}
public override bool Equals(object obj)
{
return Equals((SymbolResult)obj);
}
public bool Equals(SymbolResult other)
{
return Equals(Symbol, other.Symbol);
}
public override int GetHashCode()
{
return Symbol.GetHashCode();
}
public SymbolResult WithSymbol(INamespaceOrTypeSymbol other)
{
return new SymbolResult(other, Weight);
}
public int CompareTo(SymbolResult other)
{
Contract.Requires(this.Symbol is INamespaceSymbol || !((INamedTypeSymbol)this.Symbol).IsGenericType);
Contract.Requires(other.Symbol is INamespaceSymbol || !((INamedTypeSymbol)other.Symbol).IsGenericType);
var diff = this.Weight - other.Weight;
if (diff != 0)
{
return diff;
}
var names1 = this.NameParts;
var names2 = other.NameParts;
for (var i = 0; i < Math.Min(names1.Count, names2.Count); i++)
{
var comp = names1[i].CompareTo(names2[i]);
if (comp != 0)
{
return comp;
}
}
return names1.Count - names2.Count;
}
}
}
}
\ No newline at end of file
src/Features/Core/Portable/CodeFixes/Qualify/AbstractFullyQualifyCodeFixProvider.cs
浏览文件 @ 3da6c8a6
......@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeActions;
......@@ -19,6 +18,10 @@ internal abstract partial class AbstractFullyQualifyCodeFixProvider : CodeFixPro
{
private const int MaxResults = 3;
private const int NamespaceWithNoErrorsWeight = 0;
private const int TypeWeight = 1;
private const int NamespaceWithErrorsWeight = 2;
protected AbstractFullyQualifyCodeFixProvider()
{
}
......@@ -51,16 +54,16 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
if (matchingTypes != null || matchingNamespaces != null)
{
matchingTypes = matchingTypes ?? SpecializedCollections.EmptyEnumerable<SymbolResult<ISymbol>>();
matchingNamespaces = matchingNamespaces ?? SpecializedCollections.EmptyEnumerable<SymbolResult<ISymbol>>();
matchingTypes = matchingTypes ?? SpecializedCollections.EmptyEnumerable<SymbolResult>();
matchingNamespaces = matchingNamespaces ?? SpecializedCollections.EmptyEnumerable<SymbolResult>();
var matchingTypeContainers = FilterAndSort(GetContainers(matchingTypes, semanticModel.Compilation));
var matchingNamespaceContainers = FilterAndSort(GetContainers(matchingNamespaces, semanticModel.Compilation));
var proposedContainers =
matchingTypeContainers.Concat(matchingNamespaceContainers)
.Distinct()
.Take(MaxResults);
.Distinct()
.Take(MaxResults);
var displayService = project.LanguageServices.GetService<ISymbolDisplayService>();
......@@ -102,7 +105,7 @@ private async Task<Document> ProcessNode(Document document, SyntaxNode node, str
return document.WithSyntaxRoot(newRoot);
}
private async Task<IEnumerable<SymbolResult<ISymbol>>> GetMatchingTypesAsync(
private async Task<IEnumerable<SymbolResult>> GetMatchingTypesAsync(
Project project, SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
{
// Can't be on the right hand side of binary expression (like 'dot').
......@@ -130,7 +133,7 @@ private async Task<Document> ProcessNode(Document document, SyntaxNode node, str
&& HasValidContainer(s))
.ToList();
return accessibleTypeSymbols.Select(s => new SymbolResult<ISymbol>(s, weight: TypeWeight))
return accessibleTypeSymbols.Select(s => new SymbolResult(s, weight: TypeWeight))
.ToList();
}
......@@ -141,7 +144,7 @@ private static bool HasValidContainer(ISymbol symbol)
(container is INamedTypeSymbol && !((INamedTypeSymbol)container).IsGenericType);
}
private async Task<IEnumerable<SymbolResult<ISymbol>>> GetMatchingNamespacesAsync(
private async Task<IEnumerable<SymbolResult>> GetMatchingNamespacesAsync(
Project project,
SemanticModel semanticModel,
SyntaxNode simpleName,
......@@ -182,7 +185,7 @@ private static bool HasValidContainer(ISymbol symbol)
var namespaces = symbols
.OfType<INamespaceSymbol>()
.Where(n => !n.IsGlobalNamespace && HasAccessibleTypes(n, semanticModel, cancellationToken))
.Select(n => new SymbolResult<ISymbol>(n,
.Select(n => new SymbolResult(n,
BindsWithoutErrors(n, rightName, isAttributeName) ? NamespaceWithNoErrorsWeight : NamespaceWithErrorsWeight));
return namespaces.ToList();
......@@ -217,8 +220,8 @@ private bool HasAccessibleTypes(INamespaceSymbol @namespace, SemanticModel model
return Enumerable.Any(@namespace.GetAllTypes(cancellationToken), t => t.IsAccessibleWithin(model.Compilation.Assembly));
}
private static IEnumerable<SymbolResult<INamespaceOrTypeSymbol>> GetContainers(
IEnumerable<SymbolResult<ISymbol>> symbols, Compilation compilation)
private static IEnumerable<SymbolResult> GetContainers(
IEnumerable<SymbolResult> symbols, Compilation compilation)
{
foreach (var symbolResult in symbols)
{
......@@ -235,53 +238,15 @@ private bool HasAccessibleTypes(INamespaceSymbol @namespace, SemanticModel model
}
}
private IEnumerable<INamespaceOrTypeSymbol> FilterAndSort(
IEnumerable<SymbolResult<INamespaceOrTypeSymbol>> symbols)
private IEnumerable<INamespaceOrTypeSymbol> FilterAndSort(IEnumerable<SymbolResult> symbols)
{
symbols = symbols ?? SpecializedCollections.EmptyList<SymbolResult<INamespaceOrTypeSymbol>>();
symbols = symbols ?? SpecializedCollections.EmptyList<SymbolResult>();
symbols = symbols.Distinct()
.Where(n => n.Symbol is INamedTypeSymbol || !((INamespaceSymbol)n.Symbol).IsGlobalNamespace)
.OrderBy(Compare);
.Order();
return symbols.Select(n => n.Symbol).ToList();
}
private static readonly ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>> s_symbolToNameMap =
new ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>>();
private static readonly ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>>.CreateValueCallback s_getNameParts = GetNameParts;
private static IList<string> GetNameParts(INamespaceOrTypeSymbol symbol)
{
return symbol.ToNameDisplayString().Split('.');
}
private static int Compare(
SymbolResult<INamespaceOrTypeSymbol> n1,
SymbolResult<INamespaceOrTypeSymbol> n2)
{
Contract.Requires(n1.Symbol is INamespaceSymbol || !((INamedTypeSymbol)n1.Symbol).IsGenericType);
Contract.Requires(n2.Symbol is INamespaceSymbol || !((INamedTypeSymbol)n2.Symbol).IsGenericType);
var diff = n1.Weight - n2.Weight;
if (diff != 0)
{
return diff;
}
var names1 = s_symbolToNameMap.GetValue(n1.Symbol, GetNameParts);
var names2 = s_symbolToNameMap.GetValue(n2.Symbol, GetNameParts);
for (var i = 0; i < Math.Min(names1.Count, names2.Count); i++)
{
var comp = names1[i].CompareTo(names2[i]);
if (comp != 0)
{
return comp;
}
}
return names1.Count - names2.Count;
}
private class MyCodeAction : CodeAction.DocumentChangeAction
{
public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument) :
......@@ -289,42 +254,5 @@ private class MyCodeAction : CodeAction.DocumentChangeAction
{
}
}
private const int NamespaceWithNoErrorsWeight = 0;
private const int TypeWeight = 1;
private const int NamespaceWithErrorsWeight = 2;
private struct SymbolResult<TSymbol> : IEquatable<SymbolResult<TSymbol>>
where TSymbol : ISymbol
{
public readonly TSymbol Symbol;
public readonly int Weight;
public SymbolResult(TSymbol symbol, int weight)
{
Symbol = symbol;
Weight = weight;
}
public override bool Equals(object obj)
{
return Equals((SymbolResult<TSymbol>)obj);
}
public bool Equals(SymbolResult<TSymbol> other)
{
return Equals(Symbol, other.Symbol);
}
public override int GetHashCode()
{
return Symbol.GetHashCode();
}
public SymbolResult<TOther> WithSymbol<TOther>(TOther other) where TOther : ISymbol
{
return new SymbolResult<TOther>(other, Weight);
}
}
}
}
src/Features/Core/Portable/Features.csproj
浏览文件 @ 3da6c8a6
......@@ -115,6 +115,7 @@
<Compile Include="CodeFixes\CodeFixCollection.cs" />
<Compile Include="CodeFixes\FirstDiagnosticResult.cs" />
<Compile Include="CodeFixes\FixAllOccurrences\IFixMultipleOccurrencesService.cs" />
<Compile Include="CodeFixes\Qualify\AbstractFullyQualifyCodeFixProvider.SymbolResult.cs" />
<Compile Include="CodeFixes\Qualify\AbstractFullyQualifyCodeFixProvider.cs" />
<Compile Include="CodeFixes\GenerateMember\AbstractGenerateMemberCodeFixProvider.cs" />
<Compile Include="CodeFixes\ICodeFixProviderFactory.cs" />
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或