Skip to content

Commit ea8f0c6

Browse files
sharwellsharwell
committed
Fix style inconsistencies
* Remove unused using declarations * Adjust indentation of switch statements * Sort project files by file name
1 parent e56a567 commit ea8f0c6

9 files changed

Lines changed: 183 additions & 187 deletions

File tree

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1516CodeFixProvider.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace StyleCop.Analyzers.LayoutRules
55
{
6-
using System;
76
using System.Collections.Generic;
87
using System.Collections.Immutable;
98
using System.Composition;
@@ -66,14 +65,14 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
6665

6766
switch (codeFixAction)
6867
{
69-
case SA1516ElementsMustBeSeparatedByBlankLine.InsertBlankLineValue:
70-
return true;
68+
case SA1516ElementsMustBeSeparatedByBlankLine.InsertBlankLineValue:
69+
return true;
7170

72-
case SA1516ElementsMustBeSeparatedByBlankLine.RemoveBlankLinesValue:
73-
return false;
71+
case SA1516ElementsMustBeSeparatedByBlankLine.RemoveBlankLinesValue:
72+
return false;
7473

75-
default:
76-
return null;
74+
default:
75+
return null;
7776
}
7877
}
7978

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/OrderingRules/UsingCodeFixProvider.SourceMap.cs‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -140,37 +140,37 @@ private static void BuildDirectiveTriviaMaps(CompilationUnitSyntax compilationUn
140140
{
141141
switch (directiveTrivia.Kind())
142142
{
143-
case SyntaxKind.IfDirectiveTrivia:
144-
AddNewDirectiveTriviaSpan(conditionalBuilder, conditionalStack, directiveTrivia);
145-
break;
143+
case SyntaxKind.IfDirectiveTrivia:
144+
AddNewDirectiveTriviaSpan(conditionalBuilder, conditionalStack, directiveTrivia);
145+
break;
146146

147-
case SyntaxKind.ElifDirectiveTrivia:
148-
case SyntaxKind.ElseDirectiveTrivia:
149-
var previousSpan = conditionalStack.Pop();
150-
previousSpan.SetEnd(directiveTrivia.FullSpan.Start);
147+
case SyntaxKind.ElifDirectiveTrivia:
148+
case SyntaxKind.ElseDirectiveTrivia:
149+
var previousSpan = conditionalStack.Pop();
150+
previousSpan.SetEnd(directiveTrivia.FullSpan.Start);
151151

152-
AddNewDirectiveTriviaSpan(conditionalBuilder, conditionalStack, directiveTrivia);
153-
break;
152+
AddNewDirectiveTriviaSpan(conditionalBuilder, conditionalStack, directiveTrivia);
153+
break;
154154

155-
case SyntaxKind.EndIfDirectiveTrivia:
156-
CloseDirectiveTriviaSpan(conditionalBuilder, conditionalStack, directiveTrivia);
157-
break;
155+
case SyntaxKind.EndIfDirectiveTrivia:
156+
CloseDirectiveTriviaSpan(conditionalBuilder, conditionalStack, directiveTrivia);
157+
break;
158158

159-
case SyntaxKind.RegionDirectiveTrivia:
160-
AddNewDirectiveTriviaSpan(regionBuilder, regionStack, directiveTrivia);
161-
break;
159+
case SyntaxKind.RegionDirectiveTrivia:
160+
AddNewDirectiveTriviaSpan(regionBuilder, regionStack, directiveTrivia);
161+
break;
162162

163-
case SyntaxKind.EndRegionDirectiveTrivia:
164-
CloseDirectiveTriviaSpan(regionBuilder, regionStack, directiveTrivia);
165-
break;
163+
case SyntaxKind.EndRegionDirectiveTrivia:
164+
CloseDirectiveTriviaSpan(regionBuilder, regionStack, directiveTrivia);
165+
break;
166166

167-
case SyntaxKind.PragmaWarningDirectiveTrivia:
168-
pragmaWarningList.Add(directiveTrivia);
169-
break;
167+
case SyntaxKind.PragmaWarningDirectiveTrivia:
168+
pragmaWarningList.Add(directiveTrivia);
169+
break;
170170

171-
default:
172-
// ignore all other directive trivia
173-
break;
171+
default:
172+
// ignore all other directive trivia
173+
break;
174174
}
175175
}
176176

@@ -226,33 +226,33 @@ private static TreeTextSpan BuildPragmaWarningSpans(List<DirectiveTriviaSyntax>
226226

227227
switch (pragmaWarning.DisableOrRestoreKeyword.Kind())
228228
{
229-
case SyntaxKind.DisableKeyword:
230-
foreach (var errorCode in errorCodes)
229+
case SyntaxKind.DisableKeyword:
230+
foreach (var errorCode in errorCodes)
231+
{
232+
if (!map.ContainsKey(errorCode))
231233
{
232-
if (!map.ContainsKey(errorCode))
233-
{
234-
// only add it if the warning isn't disabled already
235-
map[errorCode] = pragmaWarning;
236-
}
234+
// only add it if the warning isn't disabled already
235+
map[errorCode] = pragmaWarning;
237236
}
237+
}
238238

239-
break;
239+
break;
240240

241-
case SyntaxKind.RestoreKeyword:
242-
foreach (var errorCode in errorCodes)
243-
{
244-
PragmaWarningDirectiveTriviaSyntax startOfSpan;
241+
case SyntaxKind.RestoreKeyword:
242+
foreach (var errorCode in errorCodes)
243+
{
244+
PragmaWarningDirectiveTriviaSyntax startOfSpan;
245245

246-
if (map.TryGetValue(errorCode, out startOfSpan))
247-
{
248-
map.Remove(errorCode);
246+
if (map.TryGetValue(errorCode, out startOfSpan))
247+
{
248+
map.Remove(errorCode);
249249

250-
var childSpan = builder.AddChild(startOfSpan.FullSpan.Start);
251-
childSpan.SetEnd(pragmaWarning.FullSpan.End);
252-
}
250+
var childSpan = builder.AddChild(startOfSpan.FullSpan.Start);
251+
childSpan.SetEnd(pragmaWarning.FullSpan.End);
253252
}
253+
}
254254

255-
break;
255+
break;
256256
}
257257
}
258258

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/OrderingRules/UsingCodeFixProvider.UsingsSorter.cs‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -207,27 +207,27 @@ private List<UsingDirectiveSyntax> GenerateUsings(List<UsingDirectiveSyntax> usi
207207
{
208208
switch (newLeadingTrivia[k].Kind())
209209
{
210-
case SyntaxKind.WhitespaceTrivia:
210+
case SyntaxKind.WhitespaceTrivia:
211+
newLeadingTrivia.RemoveAt(k);
212+
break;
213+
214+
case SyntaxKind.EndOfLineTrivia:
215+
if (startOfLine)
216+
{
211217
newLeadingTrivia.RemoveAt(k);
212-
break;
213-
214-
case SyntaxKind.EndOfLineTrivia:
215-
if (startOfLine)
216-
{
217-
newLeadingTrivia.RemoveAt(k);
218-
}
219-
else
220-
{
221-
startOfLine = true;
222-
k++;
223-
}
224-
225-
break;
226-
227-
default:
228-
startOfLine = newLeadingTrivia[k].IsDirective;
218+
}
219+
else
220+
{
221+
startOfLine = true;
229222
k++;
230-
break;
223+
}
224+
225+
break;
226+
227+
default:
228+
startOfLine = newLeadingTrivia[k].IsDirective;
229+
k++;
230+
break;
231231
}
232232
}
233233

@@ -275,76 +275,76 @@ private UsingDirectiveSyntax QualifyUsingDirective(UsingDirectiveSyntax usingDir
275275
NameSyntax rewrittenName;
276276
switch (originalName.Kind())
277277
{
278-
case SyntaxKind.QualifiedName:
279-
case SyntaxKind.IdentifierName:
280-
case SyntaxKind.GenericName:
281-
if (originalName.Parent.IsKind(SyntaxKind.UsingDirective)
282-
|| originalName.Parent.IsKind(SyntaxKind.TypeArgumentList))
278+
case SyntaxKind.QualifiedName:
279+
case SyntaxKind.IdentifierName:
280+
case SyntaxKind.GenericName:
281+
if (originalName.Parent.IsKind(SyntaxKind.UsingDirective)
282+
|| originalName.Parent.IsKind(SyntaxKind.TypeArgumentList))
283+
{
284+
var symbol = this.semanticModel.GetSymbolInfo(originalName, cancellationToken: CancellationToken.None).Symbol;
285+
if (symbol == null)
283286
{
284-
var symbol = this.semanticModel.GetSymbolInfo(originalName, cancellationToken: CancellationToken.None).Symbol;
285-
if (symbol == null)
287+
rewrittenName = originalName;
288+
break;
289+
}
290+
291+
if (symbol is INamespaceSymbol)
292+
{
293+
// TODO: Preserve inner trivia
294+
string fullName = symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
295+
NameSyntax replacement = SyntaxFactory.ParseName(fullName);
296+
if (!originalName.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>().Any())
286297
{
287-
rewrittenName = originalName;
288-
break;
298+
replacement = replacement.ReplaceNodes(
299+
replacement.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>(),
300+
(originalNode2, rewrittenNode2) => rewrittenNode2.Name);
289301
}
290302

291-
if (symbol is INamespaceSymbol)
303+
rewrittenName = replacement.WithTriviaFrom(originalName);
304+
break;
305+
}
306+
else if (symbol is INamedTypeSymbol)
307+
{
308+
// TODO: Preserve inner trivia
309+
// TODO: simplify after qualification
310+
string fullName;
311+
if (SpecialTypeHelper.IsPredefinedType(((INamedTypeSymbol)symbol).OriginalDefinition.SpecialType))
292312
{
293-
// TODO: Preserve inner trivia
294-
string fullName = symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
295-
NameSyntax replacement = SyntaxFactory.ParseName(fullName);
296-
if (!originalName.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>().Any())
297-
{
298-
replacement = replacement.ReplaceNodes(
299-
replacement.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>(),
300-
(originalNode2, rewrittenNode2) => rewrittenNode2.Name);
301-
}
302-
303-
rewrittenName = replacement.WithTriviaFrom(originalName);
304-
break;
313+
fullName = "global::System." + symbol.Name;
305314
}
306-
else if (symbol is INamedTypeSymbol)
315+
else
307316
{
308-
// TODO: Preserve inner trivia
309-
// TODO: simplify after qualification
310-
string fullName;
311-
if (SpecialTypeHelper.IsPredefinedType(((INamedTypeSymbol)symbol).OriginalDefinition.SpecialType))
312-
{
313-
fullName = "global::System." + symbol.Name;
314-
}
315-
else
316-
{
317-
fullName = symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
318-
}
319-
320-
NameSyntax replacement = SyntaxFactory.ParseName(fullName);
321-
if (!originalName.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>().Any())
322-
{
323-
replacement = replacement.ReplaceNodes(
324-
replacement.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>(),
325-
(originalNode2, rewrittenNode2) => rewrittenNode2.Name);
326-
}
327-
328-
rewrittenName = replacement.WithTriviaFrom(originalName);
329-
break;
317+
fullName = symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
330318
}
331-
else
319+
320+
NameSyntax replacement = SyntaxFactory.ParseName(fullName);
321+
if (!originalName.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>().Any())
332322
{
333-
rewrittenName = originalName;
334-
break;
323+
replacement = replacement.ReplaceNodes(
324+
replacement.DescendantNodesAndSelf().OfType<AliasQualifiedNameSyntax>(),
325+
(originalNode2, rewrittenNode2) => rewrittenNode2.Name);
335326
}
327+
328+
rewrittenName = replacement.WithTriviaFrom(originalName);
329+
break;
336330
}
337331
else
338332
{
339333
rewrittenName = originalName;
340334
break;
341335
}
342-
343-
case SyntaxKind.AliasQualifiedName:
344-
case SyntaxKind.PredefinedType:
345-
default:
336+
}
337+
else
338+
{
346339
rewrittenName = originalName;
347340
break;
341+
}
342+
343+
case SyntaxKind.AliasQualifiedName:
344+
case SyntaxKind.PredefinedType:
345+
default:
346+
rewrittenName = originalName;
347+
break;
348348
}
349349

350350
if (rewrittenName == originalName)

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/OrderingRules/UsingCodeFixProvider.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -148,34 +148,34 @@ private static UsingDirectivesPlacement DeterminePlacement(CompilationUnitSyntax
148148
{
149149
switch (settings.OrderingRules.UsingDirectivesPlacement)
150150
{
151-
case UsingDirectivesPlacement.InsideNamespace:
152-
var namespaceCount = CountNamespaces(compilationUnit.Members);
153-
154-
// Only move using declarations inside the namespace when
155-
// - There are no global attributes
156-
// - There is only a single namespace declared at the top level
157-
// - OrderingSettings.UsingDirectivesPlacement is set to InsideNamespace
158-
if (compilationUnit.AttributeLists.Any()
159-
|| compilationUnit.Members.Count > 1
160-
|| namespaceCount > 1)
161-
{
162-
// Override the user's setting with a more conservative one
163-
return UsingDirectivesPlacement.Preserve;
164-
}
151+
case UsingDirectivesPlacement.InsideNamespace:
152+
var namespaceCount = CountNamespaces(compilationUnit.Members);
153+
154+
// Only move using declarations inside the namespace when
155+
// - There are no global attributes
156+
// - There is only a single namespace declared at the top level
157+
// - OrderingSettings.UsingDirectivesPlacement is set to InsideNamespace
158+
if (compilationUnit.AttributeLists.Any()
159+
|| compilationUnit.Members.Count > 1
160+
|| namespaceCount > 1)
161+
{
162+
// Override the user's setting with a more conservative one
163+
return UsingDirectivesPlacement.Preserve;
164+
}
165165

166-
if (namespaceCount == 0)
167-
{
168-
return UsingDirectivesPlacement.OutsideNamespace;
169-
}
166+
if (namespaceCount == 0)
167+
{
168+
return UsingDirectivesPlacement.OutsideNamespace;
169+
}
170170

171-
return UsingDirectivesPlacement.InsideNamespace;
171+
return UsingDirectivesPlacement.InsideNamespace;
172172

173-
case UsingDirectivesPlacement.OutsideNamespace:
174-
return UsingDirectivesPlacement.OutsideNamespace;
173+
case UsingDirectivesPlacement.OutsideNamespace:
174+
return UsingDirectivesPlacement.OutsideNamespace;
175175

176-
case UsingDirectivesPlacement.Preserve:
177-
default:
178-
return UsingDirectivesPlacement.Preserve;
176+
case UsingDirectivesPlacement.Preserve:
177+
default:
178+
return UsingDirectivesPlacement.Preserve;
179179
}
180180
}
181181

0 commit comments

Comments
 (0)