Skip to content

Commit a2be1a4

Browse files
sharwellsharwell
committed
Fix the ordering by rule name
1 parent fcd7401 commit a2be1a4

File tree

9 files changed

+64
-166
lines changed

9 files changed

+64
-166
lines changed

‎src/EditorFeatures/CSharpTest/Completion/CompletionProviders/DeclarationNameCompletionProviderTests.cs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,21 +1896,21 @@ private static NamingStylePreferences NamesEndWithSuffixPreferences()
18961896
{
18971897
var specificationStyles = new[]
18981898
{
1899-
SpecificationStyle(new SymbolKindOrTypeKind(SymbolKind.Field), "Field"),
1900-
SpecificationStyle(new SymbolKindOrTypeKind(SymbolKind.Property), "Property"),
1901-
SpecificationStyle(new SymbolKindOrTypeKind(MethodKind.Ordinary), "Method"),
1902-
SpecificationStyle(new SymbolKindOrTypeKind(SymbolKind.Local), "Local"),
1903-
SpecificationStyle(new SymbolKindOrTypeKind(MethodKind.LocalFunction), "LocalFunction"),
1899+
SpecificationStyle("fields", new SymbolKindOrTypeKind(SymbolKind.Field), "Field"),
1900+
SpecificationStyle("properties", new SymbolKindOrTypeKind(SymbolKind.Property), "Property"),
1901+
SpecificationStyle("methods", new SymbolKindOrTypeKind(MethodKind.Ordinary), "Method"),
1902+
SpecificationStyle("locals", new SymbolKindOrTypeKind(SymbolKind.Local), "Local"),
1903+
SpecificationStyle("local_functions", new SymbolKindOrTypeKind(MethodKind.LocalFunction), "LocalFunction"),
19041904
};
19051905

19061906
return new NamingStylePreferences(
19071907
specificationStyles.Select(t => t.specification).ToImmutableArray(),
19081908
specificationStyles.Select(t => t.style).ToImmutableArray(),
1909-
specificationStyles.Select(t => CreateRule(t.specification, t.style)).ToImmutableArray());
1909+
specificationStyles.Select(t => CreateRule(t.name, t.specification, t.style)).ToImmutableArray());
19101910

19111911
// Local functions
19121912

1913-
(SymbolSpecification specification, NamingStyle style) SpecificationStyle(SymbolKindOrTypeKind kind, string suffix)
1913+
(string name, SymbolSpecification specification, NamingStyle style) SpecificationStyle(string name, SymbolKindOrTypeKind kind, string suffix)
19141914
{
19151915
var symbolSpecification = new SymbolSpecification(
19161916
id: null,
@@ -1927,17 +1927,12 @@ private static NamingStylePreferences NamesEndWithSuffixPreferences()
19271927
suffix: suffix,
19281928
wordSeparator: "");
19291929

1930-
return (symbolSpecification, namingStyle);
1930+
return (name, symbolSpecification, namingStyle);
19311931
}
19321932

1933-
SerializableNamingRule CreateRule(SymbolSpecification specification, NamingStyle style)
1933+
SerializableNamingRule CreateRule(string name, SymbolSpecification specification, NamingStyle style)
19341934
{
1935-
return new SerializableNamingRule()
1936-
{
1937-
SymbolSpecificationID = specification.ID,
1938-
NamingStyleID = style.ID,
1939-
EnforcementLevel = ReportDiagnostic.Error
1940-
};
1935+
return new SerializableNamingRule(name, specification.ID, style.ID, ReportDiagnostic.Error);
19411936
}
19421937
}
19431938
}

‎src/EditorFeatures/CSharpTest/ConvertAutoPropertyToFullProperty/ConvertAutoPropertyToFullPropertyTests_OptionSets.cs‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,7 @@ private NamingStylePreferences CreateCustomFieldNamingStylePreference()
7373
suffix: "",
7474
wordSeparator: "");
7575

76-
var namingRule = new SerializableNamingRule()
77-
{
78-
SymbolSpecificationID = symbolSpecification.ID,
79-
NamingStyleID = namingStyle.ID,
80-
EnforcementLevel = ReportDiagnostic.Error
81-
};
76+
var namingRule = new SerializableNamingRule("fields", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
8277

8378
var info = new NamingStylePreferences(
8479
ImmutableArray.Create(symbolSpecification),
@@ -105,12 +100,7 @@ private NamingStylePreferences CreateUnderscorePrefixedFieldNamingStylePreferenc
105100
suffix: "",
106101
wordSeparator: "");
107102

108-
var namingRule = new SerializableNamingRule()
109-
{
110-
SymbolSpecificationID = symbolSpecification.ID,
111-
NamingStyleID = namingStyle.ID,
112-
EnforcementLevel = ReportDiagnostic.Error
113-
};
103+
var namingRule = new SerializableNamingRule("fields", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
114104

115105
var info = new NamingStylePreferences(
116106
ImmutableArray.Create(symbolSpecification),
@@ -137,12 +127,7 @@ private NamingStylePreferences CreateCustomStaticFieldNamingStylePreference()
137127
suffix: "",
138128
wordSeparator: "");
139129

140-
var namingRule = new SerializableNamingRule()
141-
{
142-
SymbolSpecificationID = symbolSpecification.ID,
143-
NamingStyleID = namingStyle.ID,
144-
EnforcementLevel = ReportDiagnostic.Error
145-
};
130+
var namingRule = new SerializableNamingRule("static_fields", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
146131

147132
var info = new NamingStylePreferences(
148133
ImmutableArray.Create(symbolSpecification),

‎src/EditorFeatures/TestUtilities/Diagnostics/NamingStyles/NamingStylesTestOptionSets.cs‎

Lines changed: 17 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,7 @@ private static NamingStylePreferences ClassNamesArePascalCaseOption()
102102
prefix: "",
103103
suffix: "",
104104
wordSeparator: "");
105-
var namingRule = new SerializableNamingRule()
106-
{
107-
SymbolSpecificationID = symbolSpecification.ID,
108-
NamingStyleID = namingStyle.ID,
109-
EnforcementLevel = ReportDiagnostic.Error
110-
};
105+
var namingRule = new SerializableNamingRule("class_names_are_pascal_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
111106
var info = new NamingStylePreferences(
112107
ImmutableArray.Create(symbolSpecification),
113108
ImmutableArray.Create(namingStyle),
@@ -133,12 +128,7 @@ private NamingStylePreferences FieldNamesAreCamelCaseOption()
133128
suffix: "",
134129
wordSeparator: "");
135130

136-
var namingRule = new SerializableNamingRule()
137-
{
138-
SymbolSpecificationID = symbolSpecification.ID,
139-
NamingStyleID = namingStyle.ID,
140-
EnforcementLevel = ReportDiagnostic.Error
141-
};
131+
var namingRule = new SerializableNamingRule("field_names_are_camel_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
142132

143133
var info = new NamingStylePreferences(
144134
ImmutableArray.Create(symbolSpecification),
@@ -165,12 +155,7 @@ private NamingStylePreferences FieldNamesAreCamelCaseWithUnderscoreOption()
165155
suffix: "",
166156
wordSeparator: "");
167157

168-
var namingRule = new SerializableNamingRule()
169-
{
170-
SymbolSpecificationID = symbolSpecification.ID,
171-
NamingStyleID = namingStyle.ID,
172-
EnforcementLevel = ReportDiagnostic.Error
173-
};
158+
var namingRule = new SerializableNamingRule("field_names_are_camel_case_underscore_prefix", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
174159

175160
var info = new NamingStylePreferences(
176161
ImmutableArray.Create(symbolSpecification),
@@ -197,12 +182,7 @@ private static NamingStylePreferences MethodNamesArePascalCaseOption()
197182
suffix: "",
198183
wordSeparator: "");
199184

200-
var namingRule = new SerializableNamingRule()
201-
{
202-
SymbolSpecificationID = symbolSpecification.ID,
203-
NamingStyleID = namingStyle.ID,
204-
EnforcementLevel = ReportDiagnostic.Error
205-
};
185+
var namingRule = new SerializableNamingRule("method_names_are_pascal_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
206186
var info = new NamingStylePreferences(
207187
ImmutableArray.Create(symbolSpecification),
208188
ImmutableArray.Create(namingStyle),
@@ -228,12 +208,7 @@ private static NamingStylePreferences MethodNamesArePascalCaseOption(ImmutableAr
228208
suffix: "",
229209
wordSeparator: "");
230210

231-
var namingRule = new SerializableNamingRule()
232-
{
233-
SymbolSpecificationID = symbolSpecification.ID,
234-
NamingStyleID = namingStyle.ID,
235-
EnforcementLevel = ReportDiagnostic.Error
236-
};
211+
var namingRule = new SerializableNamingRule("method_names_are_pascal_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
237212
var info = new NamingStylePreferences(
238213
ImmutableArray.Create(symbolSpecification),
239214
ImmutableArray.Create(namingStyle),
@@ -259,12 +234,7 @@ private static NamingStylePreferences SymbolKindsArePascalCaseOption(ImmutableAr
259234
suffix: "",
260235
wordSeparator: "");
261236

262-
var namingRule = new SerializableNamingRule()
263-
{
264-
SymbolSpecificationID = symbolSpecification.ID,
265-
NamingStyleID = namingStyle.ID,
266-
EnforcementLevel = ReportDiagnostic.Error
267-
};
237+
var namingRule = new SerializableNamingRule("symbols_are_pascal_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
268238
var info = new NamingStylePreferences(
269239
ImmutableArray.Create(symbolSpecification),
270240
ImmutableArray.Create(namingStyle),
@@ -290,12 +260,7 @@ private static NamingStylePreferences AccessibilitiesArePascalCaseOption(Immutab
290260
suffix: "",
291261
wordSeparator: "");
292262

293-
var namingRule = new SerializableNamingRule()
294-
{
295-
SymbolSpecificationID = symbolSpecification.ID,
296-
NamingStyleID = namingStyle.ID,
297-
EnforcementLevel = ReportDiagnostic.Error
298-
};
263+
var namingRule = new SerializableNamingRule("accessibilities_are_pascal_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
299264
var info = new NamingStylePreferences(
300265
ImmutableArray.Create(symbolSpecification),
301266
ImmutableArray.Create(namingStyle),
@@ -321,12 +286,7 @@ private static NamingStylePreferences ParameterNamesAreCamelCaseOption()
321286
suffix: "",
322287
wordSeparator: "");
323288

324-
var namingRule = new SerializableNamingRule()
325-
{
326-
SymbolSpecificationID = symbolSpecification.ID,
327-
NamingStyleID = namingStyle.ID,
328-
EnforcementLevel = ReportDiagnostic.Error
329-
};
289+
var namingRule = new SerializableNamingRule("parameters_are_camel_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
330290

331291
var info = new NamingStylePreferences(
332292
ImmutableArray.Create(symbolSpecification),
@@ -353,12 +313,7 @@ private static NamingStylePreferences ParameterNamesAreCamelCaseWithPUnderscoreP
353313
suffix: "",
354314
wordSeparator: "");
355315

356-
var namingRule = new SerializableNamingRule()
357-
{
358-
SymbolSpecificationID = symbolSpecification.ID,
359-
NamingStyleID = namingStyle.ID,
360-
EnforcementLevel = ReportDiagnostic.Error
361-
};
316+
var namingRule = new SerializableNamingRule("parameters_are_camel_case_with_prefix", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
362317

363318
var info = new NamingStylePreferences(
364319
ImmutableArray.Create(symbolSpecification),
@@ -385,12 +340,7 @@ private static NamingStylePreferences LocalNamesAreCamelCaseOption()
385340
suffix: "",
386341
wordSeparator: "");
387342

388-
var namingRule = new SerializableNamingRule()
389-
{
390-
SymbolSpecificationID = symbolSpecification.ID,
391-
NamingStyleID = namingStyle.ID,
392-
EnforcementLevel = ReportDiagnostic.Error
393-
};
343+
var namingRule = new SerializableNamingRule("locals_are_camel_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
394344

395345
var info = new NamingStylePreferences(
396346
ImmutableArray.Create(symbolSpecification),
@@ -417,12 +367,7 @@ private static NamingStylePreferences LocalFunctionNamesAreCamelCaseOption()
417367
suffix: "",
418368
wordSeparator: "");
419369

420-
var namingRule = new SerializableNamingRule()
421-
{
422-
SymbolSpecificationID = symbolSpecification.ID,
423-
NamingStyleID = namingStyle.ID,
424-
EnforcementLevel = ReportDiagnostic.Error
425-
};
370+
var namingRule = new SerializableNamingRule("local_functions_are_camel_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
426371

427372
var info = new NamingStylePreferences(
428373
ImmutableArray.Create(symbolSpecification),
@@ -449,12 +394,7 @@ private static NamingStylePreferences PropertyNamesArePascalCaseOption()
449394
suffix: "",
450395
wordSeparator: "");
451396

452-
var namingRule = new SerializableNamingRule()
453-
{
454-
SymbolSpecificationID = symbolSpecification.ID,
455-
NamingStyleID = namingStyle.ID,
456-
EnforcementLevel = ReportDiagnostic.Error
457-
};
397+
var namingRule = new SerializableNamingRule("properties_are_pascal_case", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
458398

459399
var info = new NamingStylePreferences(
460400
ImmutableArray.Create(symbolSpecification),
@@ -481,12 +421,7 @@ private static NamingStylePreferences InterfacesNamesStartWithIOption()
481421
suffix: "",
482422
wordSeparator: "");
483423

484-
var namingRule = new SerializableNamingRule()
485-
{
486-
SymbolSpecificationID = symbolSpecification.ID,
487-
NamingStyleID = namingStyle.ID,
488-
EnforcementLevel = ReportDiagnostic.Error
489-
};
424+
var namingRule = new SerializableNamingRule("interfaces_start_with_i", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
490425

491426
var info = new NamingStylePreferences(
492427
ImmutableArray.Create(symbolSpecification),
@@ -515,12 +450,7 @@ private static NamingStylePreferences ConstantsAreUpperCaseOption()
515450
suffix: "",
516451
wordSeparator: "");
517452

518-
var namingRule = new SerializableNamingRule()
519-
{
520-
SymbolSpecificationID = symbolSpecification.ID,
521-
NamingStyleID = namingStyle.ID,
522-
EnforcementLevel = ReportDiagnostic.Error
523-
};
453+
var namingRule = new SerializableNamingRule("constants_are_all_upper", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
524454

525455
var info = new NamingStylePreferences(
526456
ImmutableArray.Create(symbolSpecification),
@@ -562,19 +492,9 @@ private static NamingStylePreferences LocalsAreCamelCaseConstantsAreUpperCaseOpt
562492
suffix: "",
563493
wordSeparator: "");
564494

565-
var localsCamelCaseNamingRule = new SerializableNamingRule()
566-
{
567-
SymbolSpecificationID = localsSymbolSpecification.ID,
568-
NamingStyleID = camelCaseNamingStyle.ID,
569-
EnforcementLevel = ReportDiagnostic.Error
570-
};
495+
var localsCamelCaseNamingRule = new SerializableNamingRule("locals_are_camel_case", localsSymbolSpecification.ID, camelCaseNamingStyle.ID, ReportDiagnostic.Error);
571496

572-
var constLocalsUpperCaseNamingRule = new SerializableNamingRule()
573-
{
574-
SymbolSpecificationID = constLocalsSymbolSpecification.ID,
575-
NamingStyleID = allUpperNamingStyle.ID,
576-
EnforcementLevel = ReportDiagnostic.Error
577-
};
497+
var constLocalsUpperCaseNamingRule = new SerializableNamingRule("constants_are_upper_case", constLocalsSymbolSpecification.ID, allUpperNamingStyle.ID, ReportDiagnostic.Error);
578498

579499
var info = new NamingStylePreferences(
580500
ImmutableArray.Create(localsSymbolSpecification, constLocalsSymbolSpecification),
@@ -603,12 +523,7 @@ private static NamingStylePreferences AsyncFunctionNamesEndWithAsyncOption()
603523
suffix: "Async",
604524
wordSeparator: "");
605525

606-
var namingRule = new SerializableNamingRule()
607-
{
608-
SymbolSpecificationID = symbolSpecification.ID,
609-
NamingStyleID = namingStyle.ID,
610-
EnforcementLevel = ReportDiagnostic.Error
611-
};
526+
var namingRule = new SerializableNamingRule("async_functions_end_with_async", symbolSpecification.ID, namingStyle.ID, ReportDiagnostic.Error);
612527

613528
var info = new NamingStylePreferences(
614529
ImmutableArray.Create(symbolSpecification),

0 commit comments

Comments
 (0)