From fc572f9a951c382b4c4d6cff04ab259b68c1fd77 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Tue, 18 Apr 2023 09:46:35 +0200 Subject: [PATCH 1/4] Add a test --- .../SymbolDisplay/SymbolDisplayTests.cs | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs b/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs index b4738476b29b4..368b38a6838b2 100644 --- a/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs @@ -8222,6 +8222,71 @@ void M(string s!!) SymbolDisplayPartKind.Punctuation); } + [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/67464")] + public void Parameter_Standalone() + { + var source = """ + class C + { + void M(ref int p) { } + } + """; + var comp = CreateCompilation(source); + var methodSymbol = comp.GetMember("C.M").GetPublicSymbol(); + var parameterSymbol = methodSymbol.Parameters.Single(); + + var format = s_memberSignatureDisplayFormat.RemoveParameterOptions(SymbolDisplayParameterOptions.IncludeName); + + Verify(methodSymbol.ToDisplayParts(format), "void C.M(ref int)", + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.ClassName, + SymbolDisplayPartKind.Punctuation, + SymbolDisplayPartKind.MethodName, + SymbolDisplayPartKind.Punctuation, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Punctuation); + + Verify(methodSymbol.ToDisplayParts(SymbolDisplayFormat.CSharpErrorMessageFormat), "C.M(ref int)", + SymbolDisplayPartKind.ClassName, + SymbolDisplayPartKind.Punctuation, + SymbolDisplayPartKind.MethodName, + SymbolDisplayPartKind.Punctuation, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Punctuation); + + Verify(methodSymbol.ToDisplayParts(SymbolDisplayFormat.CSharpErrorMessageNoParameterNamesFormat), "C.M(ref int)", + SymbolDisplayPartKind.ClassName, + SymbolDisplayPartKind.Punctuation, + SymbolDisplayPartKind.MethodName, + SymbolDisplayPartKind.Punctuation, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Punctuation); + + Verify(parameterSymbol.ToDisplayParts(format), "ref int", + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.Keyword); + + Verify(parameterSymbol.ToDisplayParts(SymbolDisplayFormat.CSharpErrorMessageFormat), "ref int p", + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.ParameterName); + + Verify(parameterSymbol.ToDisplayParts(SymbolDisplayFormat.CSharpErrorMessageNoParameterNamesFormat), "ref int", + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.Keyword); + } + [Fact] public void TestRequiredProperty() { From 173c26af78268642d6e799743c5a8b379bfd9e1a Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Tue, 18 Apr 2023 09:28:13 +0200 Subject: [PATCH 2/4] Display standalone parameter names by default --- .../SymbolDisplay/SymbolDisplayVisitor.Members.cs | 2 +- .../Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs | 6 ++++-- .../SymbolDisplay/SymbolDisplayCompilerInternalOptions.cs | 5 ++--- .../Core/Portable/SymbolDisplay/SymbolDisplayFormat.cs | 8 +++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Compilers/CSharp/Portable/SymbolDisplay/SymbolDisplayVisitor.Members.cs b/src/Compilers/CSharp/Portable/SymbolDisplay/SymbolDisplayVisitor.Members.cs index da9b6816450a8..9aeeb3524e212 100644 --- a/src/Compilers/CSharp/Portable/SymbolDisplay/SymbolDisplayVisitor.Members.cs +++ b/src/Compilers/CSharp/Portable/SymbolDisplay/SymbolDisplayVisitor.Members.cs @@ -798,7 +798,7 @@ public override void VisitParameter(IParameterSymbol symbol) var includeType = format.ParameterOptions.IncludesOption(SymbolDisplayParameterOptions.IncludeType); var includeName = symbol.Name.Length != 0 && (format.ParameterOptions.IncludesOption(SymbolDisplayParameterOptions.IncludeName) || - (format.CompilerInternalOptions.IncludesOption(SymbolDisplayCompilerInternalOptions.IncludeParameterNameIfStandalone) && builder.Count == 0)); + (!format.CompilerInternalOptions.IncludesOption(SymbolDisplayCompilerInternalOptions.ExcludeParameterNameIfStandalone) && builder.Count == 0)); var includeBrackets = format.ParameterOptions.IncludesOption(SymbolDisplayParameterOptions.IncludeOptionalBrackets); var includeDefaultValue = format.ParameterOptions.IncludesOption(SymbolDisplayParameterOptions.IncludeDefaultValue) && format.ParameterOptions.IncludesOption(SymbolDisplayParameterOptions.IncludeName) && diff --git a/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs b/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs index 368b38a6838b2..9da6044f90402 100644 --- a/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs @@ -8269,10 +8269,12 @@ void M(ref int p) { } SymbolDisplayPartKind.Keyword, SymbolDisplayPartKind.Punctuation); - Verify(parameterSymbol.ToDisplayParts(format), "ref int", + Verify(parameterSymbol.ToDisplayParts(format), "ref int p", SymbolDisplayPartKind.Keyword, SymbolDisplayPartKind.Space, - SymbolDisplayPartKind.Keyword); + SymbolDisplayPartKind.Keyword, + SymbolDisplayPartKind.Space, + SymbolDisplayPartKind.ParameterName); Verify(parameterSymbol.ToDisplayParts(SymbolDisplayFormat.CSharpErrorMessageFormat), "ref int p", SymbolDisplayPartKind.Keyword, diff --git a/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayCompilerInternalOptions.cs b/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayCompilerInternalOptions.cs index b5b970f3cf55c..eea505665d8d8 100644 --- a/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayCompilerInternalOptions.cs +++ b/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayCompilerInternalOptions.cs @@ -69,10 +69,9 @@ internal enum SymbolDisplayCompilerInternalOptions IncludeContainingFileForFileTypes = 1 << 8, /// - /// Equivalent to - /// but only if the parameter is displayed on its own + /// Does not include parameter name if the parameter is displayed on its own /// (i.e., not as part of a method, delegate, or indexer). /// - IncludeParameterNameIfStandalone = 1 << 9, + ExcludeParameterNameIfStandalone = 1 << 9, } } diff --git a/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayFormat.cs b/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayFormat.cs index a5ed1dc05cdb2..7ff86cd4e5360 100644 --- a/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayFormat.cs +++ b/src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayFormat.cs @@ -32,11 +32,10 @@ public class SymbolDisplayFormat SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.UseAsterisksInMultiDimensionalArrays | SymbolDisplayMiscellaneousOptions.UseErrorTypeSymbolName | - SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier, - compilerInternalOptions: SymbolDisplayCompilerInternalOptions.IncludeParameterNameIfStandalone); + SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier); internal static SymbolDisplayFormat CSharpErrorMessageNoParameterNamesFormat { get; } = CSharpErrorMessageFormat - .RemoveCompilerInternalOptions(SymbolDisplayCompilerInternalOptions.IncludeParameterNameIfStandalone); + .AddCompilerInternalOptions(SymbolDisplayCompilerInternalOptions.ExcludeParameterNameIfStandalone); /// /// Formats a symbol description as in a C# compiler short error message. @@ -59,8 +58,7 @@ public class SymbolDisplayFormat SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.UseAsterisksInMultiDimensionalArrays | SymbolDisplayMiscellaneousOptions.UseErrorTypeSymbolName | - SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier, - compilerInternalOptions: SymbolDisplayCompilerInternalOptions.IncludeParameterNameIfStandalone); + SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier); /// /// Formats a symbol description as in a Visual Basic compiler error message. From 2fc98dd92d71f06910ec6c919ef40358580cccb9 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Tue, 18 Apr 2023 10:09:15 +0200 Subject: [PATCH 3/4] Document breaking change --- docs/Breaking API Changes.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/Breaking API Changes.md b/docs/Breaking API Changes.md index 994d2b6dd8d3a..95ca0f4d63b77 100644 --- a/docs/Breaking API Changes.md +++ b/docs/Breaking API Changes.md @@ -71,3 +71,12 @@ All property setters now throw an exception. The `Workspace` and `DocumentId` parameters of `TextLoader.LoadTextAndVersionAsync(Workspace, DocumentId, CancellationToken)` are deprecated. The method now receives `null` `Workspace` and `DocumentId`. + +# Version 4.5.0 + +`SymbolDisplayFormat.CSharpErrorMessageFormat` and `CSharpShortErrorMessageFormat` now include parameter names by default if used on a standalone `IParameterSymbol`. +For example, parameter `p` in `void M(ref int p)` was previously formatted as `"ref int"` and now it is formatted as `"ref int p"`. + +# Version 4.6.0 + +All `SymbolDisplayFormat`s (predefined and user-created) now include parameter names by default if used on a standalone `IParameterSymbol` for consistency with predefined formats (see the breaking change for version 4.5.0 above). From 5e7ae18089c89edb716678be36677d41680d6fc6 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Tue, 18 Apr 2023 11:26:32 +0200 Subject: [PATCH 4/4] Update tests --- ...ddConstructorParametersFromMembersTests.cs | 66 +++++++++---------- .../GenerateConstructorFromMembersTests.cs | 6 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs b/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs index 6e2168987e923..c2bce6842af06 100644 --- a/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs +++ b/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs @@ -89,7 +89,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -131,7 +131,7 @@ public Program( } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -180,7 +180,7 @@ public Program( } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int, string)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i, string s)"), codeAction.Title) }.RunAsync(); } @@ -227,7 +227,7 @@ public Program(int i, } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int, string)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i, string s)"), codeAction.Title) }.RunAsync(); } @@ -274,7 +274,7 @@ public Program(int i, } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int, string)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i, string s)"), codeAction.Title) }.RunAsync(); } @@ -316,7 +316,7 @@ public Program(int i, string s = null) } """, CodeActionIndex = 1, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_optional_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_optional_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -371,7 +371,7 @@ public Program(int i, string s, bool b) : this(i) } """, CodeActionIndex = 1, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "Program(int, string)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "Program(int i, string s)"), codeAction.Title) }.RunAsync(); } @@ -426,7 +426,7 @@ public Program(int i, string s, bool b = false) : this(i) } """, CodeActionIndex = 3, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "Program(int, string)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "Program(int i, string s)"), codeAction.Title) }.RunAsync(); } @@ -466,7 +466,7 @@ public Program(bool b, HashSet s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(bool)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(bool b)"), codeAction.Title) }.RunAsync(); } @@ -507,7 +507,7 @@ public Program(bool b, HashSet s = null) } """, CodeActionIndex = 1, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_optional_parameters_to_0, "Program(bool)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_optional_parameters_to_0, "Program(bool b)"), codeAction.Title) }.RunAsync(); } @@ -1195,7 +1195,7 @@ public C(int i, int j, int k) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i)"), codeAction.Title) }.RunAsync(); } @@ -1240,7 +1240,7 @@ public C(int i, int j, int l) TestCode = source, FixedCode = expected, CodeActionIndex = 1, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i, int j)"), codeAction.Title) }.RunAsync(); } @@ -1286,7 +1286,7 @@ public C(int i, int j, int k, int l) TestCode = source, FixedCode = expected, CodeActionIndex = 2, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, int, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i, int j, int k)"), codeAction.Title) }.RunAsync(); } @@ -1331,7 +1331,7 @@ public C(int i, int j, int k) TestCode = source, FixedCode = expected, CodeActionIndex = 3, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i)"), codeAction.Title) }.RunAsync(); } @@ -1377,7 +1377,7 @@ public C(int i, int j, int l = 0) TestCode = source, FixedCode = expected, CodeActionIndex = 4, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i, int j)"), codeAction.Title) }.RunAsync(); } @@ -1422,7 +1422,7 @@ public C(int i, int j, int k, int l = 0) TestCode = source, FixedCode = expected, CodeActionIndex = 5, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, int, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i, int j, int k)"), codeAction.Title) }.RunAsync(); } @@ -1483,7 +1483,7 @@ public C(int i, double j, int k, int l) TestCode = source, FixedCode = expected, CodeActionIndex = 1, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, double, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i, double j, int k)"), codeAction.Title) }.RunAsync(); } @@ -1540,7 +1540,7 @@ public C(int i, double j = 0, int l = 0) TestCode = source, FixedCode = expected, CodeActionIndex = 3, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, double)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i, double j)"), codeAction.Title) }.RunAsync(); } @@ -1582,7 +1582,7 @@ public C(int l, double m, int n = 0) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int i)"), codeAction.Title) }.RunAsync(); } @@ -1627,7 +1627,7 @@ public C(int l, double m, int n = 0, int p = 0) TestCode = source, FixedCode = expected, CodeActionIndex = 2, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int, double, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(CodeFixesResources.Add_to_0, "C(int l, double m, int n)"), codeAction.Title) }.RunAsync(); } @@ -1945,7 +1945,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -1985,7 +1985,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2025,7 +2025,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2065,7 +2065,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2105,7 +2105,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2145,7 +2145,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2186,7 +2186,7 @@ public Program(int i, string s, string t) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2227,7 +2227,7 @@ public Program(int i, string s, string t) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2267,7 +2267,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2307,7 +2307,7 @@ public Program(int i, string s) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2347,7 +2347,7 @@ public Program(int i, string t) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2387,7 +2387,7 @@ public Program(int i, string t) } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "Program(int i)"), codeAction.Title) }.RunAsync(); } @@ -2690,7 +2690,7 @@ public C( } } """, - CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "C(int, int)"), codeAction.Title) + CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "C(int original, int original2)"), codeAction.Title) }.RunAsync(); } diff --git a/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs b/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs index 4a6b497bfabfd..ced525a38e768 100644 --- a/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs +++ b/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs @@ -741,7 +741,7 @@ class Program HashSet s;|] } """, -string.Format(FeaturesResources.Generate_constructor_0_1, "Program", "bool, HashSet")); +string.Format(FeaturesResources.Generate_constructor_0_1, "Program", "bool b, HashSet s")); } [Fact] @@ -762,7 +762,7 @@ public Program(bool b) } } """, -string.Format(FeaturesResources.Generate_field_assigning_constructor_0_1, "Program", "bool, HashSet")); +string.Format(FeaturesResources.Generate_field_assigning_constructor_0_1, "Program", "bool b, HashSet s")); } [Fact] @@ -783,7 +783,7 @@ public Program(bool b) } } """, -string.Format(FeaturesResources.Generate_delegating_constructor_0_1, "Program", "bool, HashSet"), +string.Format(FeaturesResources.Generate_delegating_constructor_0_1, "Program", "bool b, HashSet s"), index: 1); }