Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

提交 e74ae06f 编写于 作者: M Marcin Wachulski
浏览文件
操作

Fix naming consistency of ConvertAutoPropertyToFullProperty refactoring 

ConvertAutoPropertyToFullProperty had prefixed fields with '_' by default
when no user naming preferences had been set up (hardcode for that specific
refactoring).

According to dotnet/roslyn#22884, it should be aligned to fallback defaults
of CSharpInitializeMemberFromParameterCodeRefactoringProvider.

Fixes dotnet/roslyn#26992
上级 15e1f31f
隐藏空白更改
内联 并排
Showing with 107 addition and 126 deletion
src/EditorFeatures/CSharpTest/ConvertAutoPropertyToFullProperty/ConvertAutoPropertyToFullPropertyTests.cs
浏览文件 @ e74ae06f
......@@ -30,17 +30,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -61,17 +61,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
......@@ -92,17 +92,17 @@ class goo
var expected = @"
class goo
{
private int _goo = 2;
private int goo = 2;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -124,17 +124,17 @@ class goo
class goo
{
const int num = 345;
private int _goo = 2 * num;
private int goo = 2 * num;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -154,17 +154,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
private set
{
_goo = value;
goo = value;
}
}
}
......@@ -178,7 +178,7 @@ public async Task WithFieldNameAlreadyUsed()
var text = @"
class goo
{
private int _goo;
private int goo;
public int G[||]oo { get; private set; }
}
......@@ -186,18 +186,18 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int _goo1;
private int goo;
private int goo1;
public int Goo
{
get
{
return _goo1;
return goo1;
}
private set
{
_goo1 = value;
goo1 = value;
}
}
}
......@@ -219,18 +219,18 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
// Comments before
public int Goo
{
get
{
return _goo;
return goo;
}
private set
{
_goo = value;
goo = value;
}
} //Comments during
//Comments after
......@@ -251,9 +251,9 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo { get => _goo; set => _goo = value; }
public int Goo { get => goo; set => goo = value; }
}
";
await TestInRegularAndScriptAsync(text, expected, options: PreferExpressionBodiedAccessorsWhenPossible);
......@@ -271,9 +271,9 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo { get => _goo; set => _goo = value; }
public int Goo { get => goo; set => goo = value; }
}
";
await TestInRegularAndScriptAsync(text, expected, options: PreferExpressionBodiedAccessorsWhenOnSingleLine);
......@@ -295,12 +295,12 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get => _goo;
set => _goo = value;
get => goo;
set => goo = value;
}
}
";
......@@ -319,9 +319,9 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo { get /* test */ => _goo; set /* test2 */ => _goo = value; }
public int Goo { get /* test */ => goo; set /* test2 */ => goo = value; }
}
";
await TestInRegularAndScriptAsync(text, expected, options: PreferExpressionBodiedAccessorsWhenPossible);
......@@ -339,16 +339,16 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo {
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -368,15 +368,15 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get {
return _goo;
return goo;
}
set {
_goo = value;
goo = value;
}
}
}
......@@ -396,17 +396,17 @@ class goo
var expected = @"
class goo
{
private static int s_goo;
private static int goo;
public static int Goo
{
get
{
return s_goo;
return goo;
}
set
{
s_goo = value;
goo = value;
}
}
}
......@@ -426,17 +426,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
protected int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -456,17 +456,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
internal int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -487,18 +487,18 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
[A]
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -515,26 +515,26 @@ class goo
/// <summary>
/// test stuff here
/// </summary>
public int testg[||]oo { /* test1 */ get /* test2 */; /* test3 */ set /* test4 */; /* test5 */ } /* test6 */
public int Testg[||]oo { /* test1 */ get /* test2 */; /* test3 */ set /* test4 */; /* test5 */ } /* test6 */
}
";
var expected = @"
class goo
{
private int _testgoo;
private int testgoo;
/// <summary>
/// test stuff here
/// </summary>
public int testgoo
public int Testgoo
{ /* test1 */
get /* test2 */
{
return _testgoo;
return testgoo;
} /* test3 */
set /* test4 */
{
_testgoo = value;
testgoo = value;
} /* test5 */
} /* test6 */
}
......@@ -564,17 +564,17 @@ class MyBaseClass
class MyDerivedClass : MyBaseClass
{
private string _name;
private string name;
public override string Name
{
get
{
return _name;
return name;
}
set
{
_name = value;
name = value;
}
}
}
......@@ -594,17 +594,17 @@ class MyClass
var expected = @"
class MyClass
{
private string _name;
private string name;
public sealed string Name
{
get
{
return _name;
return name;
}
set
{
_name = value;
name = value;
}
}
}
......@@ -629,17 +629,17 @@ class MyDerivedClass : MyBaseClass
var expected = @"
class MyBaseClass
{
private string _name;
private string name;
public virtual string Name
{
get
{
return _name;
return name;
}
set
{
_name = value;
name = value;
}
}
}
......@@ -664,17 +664,17 @@ class MyClass
var expected = @"
class MyClass
{
private string _name;
private string name;
private string Name
{
get
{
return _name;
return name;
}
set
{
_name = value;
name = value;
}
}
}
......@@ -723,13 +723,13 @@ class goo
var expected = @"
class goo
{
private readonly int _goo;
private readonly int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
}
}
......@@ -749,9 +749,9 @@ class goo
var expected = @"
class goo
{
private readonly int _goo;
private readonly int goo;
public int Goo => _goo;
public int Goo => goo;
}
";
await TestInRegularAndScriptAsync(text, expected, options: PreferExpressionBodiesOnAccessorsAndMethods);
......@@ -778,9 +778,9 @@ public async Task ExpressionBodiedAccessors()
var text = @"
class goo
{
private int _testgoo;
private int testgoo;
public int testg[||]oo {get => _testgoo; set => _testgoo = value; }
public int testg[||]oo {get => testgoo; set => testgoo = value; }
}
";
await TestMissingAsync(text);
......@@ -798,17 +798,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -828,17 +828,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -924,17 +924,17 @@ class goo
var expected = @"
class goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -996,17 +996,17 @@ struct goo
var expected = @"
struct goo
{
private int _goo;
private int goo;
public int Goo
{
get
{
return _goo;
return goo;
}
set
{
_goo = value;
goo = value;
}
}
}
......@@ -1037,9 +1037,9 @@ partial class Program
partial class Program
{
private int _q;
private int q;
int Q { get => _q; set => _q = value; }
int Q { get => q; set => q = value; }
}
";
await TestInRegularAndScriptAsync(text, expected);
......@@ -1062,9 +1062,9 @@ partial class Program
var file1AfterRefactor = @"
partial class Program
{
private int _p;
private int p;
int P { get => _p; set => _p = value; }
int P { get => p; set => p = value; }
}";
var xmlString = string.Format(@"
......@@ -1108,9 +1108,9 @@ partial class Program
var file2AfterRefactor = @"
partial class Program
{
private int _q;
private int q;
int Q { get => _q; set => _q = value; }
int Q { get => q; set => q = value; }
}";
var xmlString = string.Format(@"
......
src/Features/CSharp/Portable/ConvertAutoPropertyToFullProperty/CSharpConvertAutoPropertyToFullPropertyCodeRefactoringProvider.cs
浏览文件 @ e74ae06f
......@@ -67,35 +67,13 @@ internal override async Task<string> GetFieldNameAsync(Document document, IPrope
Document document,
CancellationToken cancellationToken)
{
const string defaultStaticFieldPrefix = "s_";
const string defaultFieldPrefix = "_";
var optionSet = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
var namingPreferencesOption = optionSet.GetOption(SimplificationOptions.NamingPreferences);
var rules = namingPreferencesOption.CreateRules().NamingRules
.AddRange(CreateNewRule(ImmutableArray.Create(new ModifierKind(ModifierKindEnum.IsStatic)), defaultStaticFieldPrefix))
.AddRange(CreateNewRule(modifiers: default, defaultFieldPrefix));
.AddRange(CodeAnalysis.InitializeParameter.FallbackNamingRules.Rules);
return rules;
}
private static ImmutableArray<NamingRule> CreateNewRule(
ImmutableArray<ModifierKind> modifiers,
string prefix)
{
return ImmutableArray.Create(
new NamingRule(
new SymbolSpecification(
Guid.NewGuid(),
"Field",
ImmutableArray.Create(new SymbolSpecification.SymbolKindOrTypeKind(SymbolKind.Field)),
modifiers: modifiers),
new NamingStyles.NamingStyle(
Guid.NewGuid(),
prefix: prefix,
capitalizationScheme: Capitalization.CamelCase),
ReportDiagnostic.Hidden));
}
private string GenerateFieldName(IPropertySymbol property, ImmutableArray<NamingRule> rules)
{
var propertyName = property.Name;
......
src/Features/Core/Portable/InitializeParameter/AbstractInitializeMemberFromParameterCodeRefactoringProviderMemberCreation.cs
浏览文件 @ e74ae06f
......@@ -21,22 +21,13 @@
namespace Microsoft.CodeAnalysis.InitializeParameter
{
internal abstract partial class AbstractInitializeMemberFromParameterCodeRefactoringProvider<
TParameterSyntax,
TStatementSyntax,
TExpressionSyntax> : AbstractInitializeParameterCodeRefactoringProvider<
TParameterSyntax,
TStatementSyntax,
TExpressionSyntax>
where TParameterSyntax : SyntaxNode
where TStatementSyntax : SyntaxNode
where TExpressionSyntax : SyntaxNode
internal static class FallbackNamingRules
{
// Standard field/property names we look for when we have a parameter with a given name.
// We also use the rules to help generate fresh fields/properties. Note that we always
// look at these rules *after* the user's own rules. That way we respect user naming, but
// also have a reasonably fallback if they don't have any specified preferences.
private static readonly ImmutableArray<NamingRule> s_builtInRules = ImmutableArray.Create(
internal static readonly ImmutableArray<NamingRule> Rules = ImmutableArray.Create(
new NamingRule(new SymbolSpecification(
Guid.NewGuid(), "Property",
ImmutableArray.Create(new SymbolSpecification.SymbolKindOrTypeKind(SymbolKind.Property))),
......@@ -52,7 +43,19 @@ internal abstract partial class AbstractInitializeMemberFromParameterCodeRefacto
ImmutableArray.Create(new SymbolSpecification.SymbolKindOrTypeKind(SymbolKind.Field))),
new NamingStyles.NamingStyle(Guid.NewGuid(), prefix: "_", capitalizationScheme: Capitalization.CamelCase),
enforcementLevel: ReportDiagnostic.Hidden));
}
internal abstract partial class AbstractInitializeMemberFromParameterCodeRefactoringProvider<
TParameterSyntax,
TStatementSyntax,
TExpressionSyntax> : AbstractInitializeParameterCodeRefactoringProvider<
TParameterSyntax,
TStatementSyntax,
TExpressionSyntax>
where TParameterSyntax : SyntaxNode
where TStatementSyntax : SyntaxNode
where TExpressionSyntax : SyntaxNode
{
protected abstract SyntaxNode TryGetLastStatement(IBlockOperation blockStatementOpt);
protected override async Task<ImmutableArray<CodeAction>> GetRefactoringsAsync(
......@@ -473,7 +476,7 @@ private IOperation TryFindFieldOrPropertyAssignmentStatement(IParameterSymbol pa
// Add our built-in-rules at the end so that we always respect user naming rules
// first, but we always have something to fall-back upon if there are no matches.
var rules = namingStyleOptions.CreateRules().NamingRules.AddRange(s_builtInRules);
var rules = namingStyleOptions.CreateRules().NamingRules.AddRange(FallbackNamingRules.Rules);
return rules;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或