Skip to content
This repository was archived by the owner on Oct 2, 2022. It is now read-only.

Commit a5343be

Browse files
Bart KoelmanBart Koelman
Bart Koelman
authored and
Bart Koelman
committed
Updated formatting settings for Resharper 2017.1.1
1 parent e213e5c commit a5343be

51 files changed

Lines changed: 276 additions & 323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/CodeContractNullability/CodeContractNullability.Test/CodeContractNullability.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
</Reference>
130130
</ItemGroup>
131131
<ItemGroup>
132-
<Compile Include="DiagnosticMessageBuilder.cs" />
132+
<Compile Include="TestDataBuilders\DiagnosticMessageBuilder.cs" />
133133
<Compile Include="ReportOnNullableValueTypesTest.cs" />
134134
<Compile Include="ExactSourceCode.cs" />
135135
<Compile Include="GitHubIssueAttribute.cs" />

‎src/CodeContractNullability/CodeContractNullability.Test/CodeContractNullability.Test.csproj.DotSettings‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2-
<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">No</s:String>
32
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">True</s:Boolean>
43
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
54
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
6-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
5+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
6+
</wpf:ResourceDictionary>

‎src/CodeContractNullability/CodeContractNullability.Test/ExactSourceCode.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public sealed class ExactSourceCode : ParsedSourceCode
1414
public ExactSourceCode([NotNull] string text, [NotNull] string sourceExpected, [NotNull] string filename,
1515
[NotNull] AnalyzerSettings settings, [NotNull] ExternalAnnotationsMap externalAnnotationsMap,
1616
[NotNull] [ItemNotNull] ImmutableHashSet<MetadataReference> references, [NotNull] string codeNamespaceImport)
17-
: base(
18-
text, filename, settings, externalAnnotationsMap, references, new string[0], codeNamespaceImport, false)
17+
: base(text, filename, settings, externalAnnotationsMap, references, new string[0], codeNamespaceImport, false)
1918
{
2019
Guard.NotNull(sourceExpected, nameof(sourceExpected));
2120

‎src/CodeContractNullability/CodeContractNullability.Test/ItemNullabilityTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using CodeContractNullability.Test.TestDataBuilders;
12
using JetBrains.Annotations;
23
using Microsoft.CodeAnalysis.CodeFixes;
34

‎src/CodeContractNullability/CodeContractNullability.Test/NullabilityTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.IO;
33
using System.Text;
4+
using CodeContractNullability.Test.TestDataBuilders;
45
using CodeContractNullability.Utilities;
56
using JetBrains.Annotations;
67
using Microsoft.CodeAnalysis.CodeFixes;

‎src/CodeContractNullability/CodeContractNullability.Test/ParsedSourceCode.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ private string Parse([NotNull] string sourceText)
111111
{
112112
int importMarkerIndex = startMarker.Item2;
113113

114-
line = line.Substring(0, importMarkerIndex) +
115-
line.Substring(importMarkerIndex + ImportMarker.Length);
114+
line = line.Substring(0, importMarkerIndex) + line.Substring(importMarkerIndex + ImportMarker.Length);
116115

117116
var marker = new SourceLocation(lineNumber, importMarkerIndex + 1);
118117
importPoints.Add(marker);

‎src/CodeContractNullability/CodeContractNullability.Test/ReportOnNullableValueTypesTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ protected override void VerifyNullabilityFix(ParsedSourceCode source, params str
2121

2222
AnalyzerTestContext analyzerContext = CreateTestContext(source);
2323

24-
var fixTestContext = new FixProviderTestContext(analyzerContext, new[] { string.Empty },
25-
source.ReIndentExpected);
24+
var fixTestContext = new FixProviderTestContext(analyzerContext, new[] { string.Empty }, source.ReIndentExpected);
2625

2726
AssertDiagnosticsWithCodeFixes(fixTestContext, messages);
2827
}

‎src/CodeContractNullability/CodeContractNullability.Test/RoslynTestFramework/AnalysisTestFixture.cs‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public abstract class AnalysisTestFixture
2828
[NotNull]
2929
protected abstract CodeFixProvider CreateFixProvider();
3030

31-
protected void AssertDiagnostics([NotNull] AnalyzerTestContext context,
32-
[NotNull] [ItemNotNull] params string[] messages)
31+
protected void AssertDiagnostics([NotNull] AnalyzerTestContext context, [NotNull] [ItemNotNull] params string[] messages)
3332
{
3433
Guard.NotNull(context, nameof(context));
3534
Guard.NotNull(messages, nameof(messages));
@@ -50,8 +49,7 @@ private AnalysisResult RunDiagnostics([NotNull] AnalyzerTestContext context,
5049
}
5150

5251
[NotNull]
53-
private AnalysisResult GetAnalysisResult([NotNull] AnalyzerTestContext context,
54-
[NotNull] [ItemNotNull] string[] messages)
52+
private AnalysisResult GetAnalysisResult([NotNull] AnalyzerTestContext context, [NotNull] [ItemNotNull] string[] messages)
5553
{
5654
DocumentWithSpans documentWithSpans = DocumentFactory.GetDocumentWithSpansFromMarkup(context);
5755

@@ -66,10 +64,8 @@ private AnalysisResult GetAnalysisResult([NotNull] AnalyzerTestContext context,
6664
private IList<Diagnostic> GetSortedAnalyzerDiagnostics([NotNull] AnalyzerTestContext context,
6765
[NotNull] DocumentWithSpans documentWithSpans)
6866
{
69-
IEnumerable<Diagnostic> diagnostics =
70-
EnumerateDiagnosticsForDocument(documentWithSpans.Document, context.ValidationMode,
71-
context.DiagnosticsCaptureMode, context.Options)
72-
.Where(d => d.Id == DiagnosticId);
67+
IEnumerable<Diagnostic> diagnostics = EnumerateDiagnosticsForDocument(documentWithSpans.Document,
68+
context.ValidationMode, context.DiagnosticsCaptureMode, context.Options).Where(d => d.Id == DiagnosticId);
7369

7470
if (context.DiagnosticsCaptureMode == DiagnosticsCaptureMode.RequireInSourceTree)
7571
{
@@ -82,11 +78,9 @@ private IList<Diagnostic> GetSortedAnalyzerDiagnostics([NotNull] AnalyzerTestCon
8278
[NotNull]
8379
[ItemNotNull]
8480
private IEnumerable<Diagnostic> EnumerateDiagnosticsForDocument([NotNull] Document document,
85-
TestValidationMode validationMode, DiagnosticsCaptureMode diagnosticsCaptureMode,
86-
[NotNull] AnalyzerOptions options)
81+
TestValidationMode validationMode, DiagnosticsCaptureMode diagnosticsCaptureMode, [NotNull] AnalyzerOptions options)
8782
{
88-
CompilationWithAnalyzers compilationWithAnalyzers = GetCompilationWithAnalyzers(document, validationMode,
89-
options);
83+
CompilationWithAnalyzers compilationWithAnalyzers = GetCompilationWithAnalyzers(document, validationMode, options);
9084

9185
SyntaxTree tree = document.GetSyntaxTreeAsync().Result;
9286

@@ -138,8 +132,7 @@ private static bool LocationIsInSourceTree([NotNull] Location location, [CanBeNu
138132
return location.IsInSource && location.SourceTree == tree;
139133
}
140134

141-
private static void VerifyDiagnosticCount([NotNull] AnalysisResult result,
142-
DiagnosticsCaptureMode captureMode)
135+
private static void VerifyDiagnosticCount([NotNull] AnalysisResult result, DiagnosticsCaptureMode captureMode)
143136
{
144137
if (captureMode == DiagnosticsCaptureMode.RequireInSourceTree)
145138
{
@@ -193,8 +186,7 @@ private void RunCodeFixes([NotNull] FixProviderTestContext context, [NotNull] Di
193186
{
194187
for (int index = 0; index < context.Expected.Count; index++)
195188
{
196-
Document document =
197-
DocumentFactory.GetDocumentWithSpansFromMarkup(context.AnalyzerTestContext).Document;
189+
Document document = DocumentFactory.GetDocumentWithSpansFromMarkup(context.AnalyzerTestContext).Document;
198190

199191
ImmutableArray<CodeAction> codeFixes = GetCodeFixesForDiagnostic(diagnostic, document, fixProvider);
200192
codeFixes.Should().HaveSameCount(context.Expected);
@@ -204,8 +196,8 @@ private void RunCodeFixes([NotNull] FixProviderTestContext context, [NotNull] Di
204196
}
205197

206198
[ItemNotNull]
207-
private ImmutableArray<CodeAction> GetCodeFixesForDiagnostic([NotNull] Diagnostic diagnostic,
208-
[NotNull] Document document, [NotNull] CodeFixProvider fixProvider)
199+
private ImmutableArray<CodeAction> GetCodeFixesForDiagnostic([NotNull] Diagnostic diagnostic, [NotNull] Document document,
200+
[NotNull] CodeFixProvider fixProvider)
209201
{
210202
ImmutableArray<CodeAction>.Builder builder = ImmutableArray.CreateBuilder<CodeAction>();
211203
Action<CodeAction, ImmutableArray<Diagnostic>> registerCodeFix = (codeAction, _) => builder.Add(codeAction);
@@ -225,8 +217,7 @@ private static void VerifyCodeAction([NotNull] CodeAction codeAction, [NotNull]
225217
{
226218
Guard.NotNull(expectedCode, nameof(expectedCode));
227219

228-
ImmutableArray<CodeActionOperation> operations =
229-
codeAction.GetOperationsAsync(CancellationToken.None).Result;
220+
ImmutableArray<CodeActionOperation> operations = codeAction.GetOperationsAsync(CancellationToken.None).Result;
230221

231222
operations.Should().HaveCount(1);
232223

‎src/CodeContractNullability/CodeContractNullability.Test/RoslynTestFramework/AnalyzerTestContext.cs‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,10 @@ public sealed class AnalyzerTestContext
5656
[NotNull]
5757
public AnalyzerOptions Options { get; }
5858

59-
private AnalyzerTestContext([NotNull] string markupCode, [NotNull] string languageName,
60-
[NotNull] string fileName, [NotNull] string assemblyName,
61-
[NotNull] [ItemNotNull] ImmutableHashSet<MetadataReference> references, DocumentationMode documentationMode,
62-
OperationFeature operationFeature, [CanBeNull] int? compilerWarningLevel, TestValidationMode validationMode,
63-
DiagnosticsCaptureMode diagnosticsCaptureMode, [NotNull] AnalyzerOptions options)
59+
private AnalyzerTestContext([NotNull] string markupCode, [NotNull] string languageName, [NotNull] string fileName,
60+
[NotNull] string assemblyName, [NotNull] [ItemNotNull] ImmutableHashSet<MetadataReference> references,
61+
DocumentationMode documentationMode, OperationFeature operationFeature, [CanBeNull] int? compilerWarningLevel,
62+
TestValidationMode validationMode, DiagnosticsCaptureMode diagnosticsCaptureMode, [NotNull] AnalyzerOptions options)
6463
{
6564
MarkupCode = markupCode;
6665
LanguageName = languageName;
@@ -75,12 +74,9 @@ private AnalyzerTestContext([NotNull] string markupCode, [NotNull] string langua
7574
Options = options;
7675
}
7776

78-
public AnalyzerTestContext([NotNull] string markupCode, [NotNull] string languageName,
79-
[NotNull] AnalyzerOptions options)
80-
: this(
81-
markupCode, languageName, DefaultFileName, DefaultAssemblyName, DefaultReferences,
82-
DefaultDocumentationMode, DefaultOperationFeature, null, DefaultTestValidationMode,
83-
DiagnosticsCaptureMode.RequireInSourceTree, options)
77+
public AnalyzerTestContext([NotNull] string markupCode, [NotNull] string languageName, [NotNull] AnalyzerOptions options)
78+
: this(markupCode, languageName, DefaultFileName, DefaultAssemblyName, DefaultReferences, DefaultDocumentationMode,
79+
DefaultOperationFeature, null, DefaultTestValidationMode, DiagnosticsCaptureMode.RequireInSourceTree, options)
8480
{
8581
Guard.NotNull(markupCode, nameof(markupCode));
8682
Guard.NotNullNorWhiteSpace(languageName, nameof(languageName));
@@ -92,27 +88,24 @@ public AnalyzerTestContext WithMarkupCode([NotNull] string markupCode)
9288
{
9389
Guard.NotNull(markupCode, nameof(markupCode));
9490

95-
return new AnalyzerTestContext(markupCode, LanguageName, FileName, AssemblyName, References,
96-
DocumentationMode, OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode,
97-
Options);
91+
return new AnalyzerTestContext(markupCode, LanguageName, FileName, AssemblyName, References, DocumentationMode,
92+
OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
9893
}
9994

10095
[NotNull]
10196
public AnalyzerTestContext InFileNamed([NotNull] string fileName)
10297
{
10398
Guard.NotNullNorWhiteSpace(fileName, nameof(fileName));
10499

105-
return new AnalyzerTestContext(MarkupCode, LanguageName, fileName, AssemblyName, References,
106-
DocumentationMode, OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode,
107-
Options);
100+
return new AnalyzerTestContext(MarkupCode, LanguageName, fileName, AssemblyName, References, DocumentationMode,
101+
OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
108102
}
109103

110104
[NotNull]
111105
public AnalyzerTestContext InAssemblyNamed([NotNull] string assemblyName)
112106
{
113-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, assemblyName, References,
114-
DocumentationMode, OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode,
115-
Options);
107+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, assemblyName, References, DocumentationMode,
108+
OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
116109
}
117110

118111
[NotNull]
@@ -122,46 +115,43 @@ public AnalyzerTestContext WithReferences([NotNull] [ItemNotNull] IEnumerable<Me
122115

123116
ImmutableList<MetadataReference> referenceList = ImmutableList.CreateRange(references);
124117

125-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName,
126-
referenceList.ToImmutableHashSet(), DocumentationMode, OperationFeature, CompilerWarningLevel,
127-
ValidationMode, DiagnosticsCaptureMode, Options);
118+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, referenceList.ToImmutableHashSet(),
119+
DocumentationMode, OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
128120
}
129121

130122
[NotNull]
131123
public AnalyzerTestContext WithDocumentationMode(DocumentationMode mode)
132124
{
133-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References, mode,
134-
OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
125+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References, mode, OperationFeature,
126+
CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
135127
}
136128

137129
[NotNull]
138130
public AnalyzerTestContext WithOperationFeature(OperationFeature feature)
139131
{
140-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References,
141-
DocumentationMode, feature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
132+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References, DocumentationMode,
133+
feature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
142134
}
143135

144136
[NotNull]
145137
public AnalyzerTestContext CompileAtWarningLevel(int warningLevel)
146138
{
147-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References,
148-
DocumentationMode, OperationFeature, warningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
139+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References, DocumentationMode,
140+
OperationFeature, warningLevel, ValidationMode, DiagnosticsCaptureMode, Options);
149141
}
150142

151143
[NotNull]
152144
public AnalyzerTestContext InValidationMode(TestValidationMode validationMode)
153145
{
154-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References,
155-
DocumentationMode, OperationFeature, CompilerWarningLevel, validationMode, DiagnosticsCaptureMode,
156-
Options);
146+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References, DocumentationMode,
147+
OperationFeature, CompilerWarningLevel, validationMode, DiagnosticsCaptureMode, Options);
157148
}
158149

159150
[NotNull]
160151
public AnalyzerTestContext AllowingDiagnosticsOutsideSourceTree()
161152
{
162-
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References,
163-
DocumentationMode, OperationFeature, CompilerWarningLevel, ValidationMode,
164-
DiagnosticsCaptureMode.AllowOutsideSourceTree, Options);
153+
return new AnalyzerTestContext(MarkupCode, LanguageName, FileName, AssemblyName, References, DocumentationMode,
154+
OperationFeature, CompilerWarningLevel, ValidationMode, DiagnosticsCaptureMode.AllowOutsideSourceTree, Options);
165155
}
166156
}
167157
}

‎src/CodeContractNullability/CodeContractNullability.Test/RoslynTestFramework/DocumentFactory.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public DocumentWithSpans GetDocumentWithSpansFromMarkup([NotNull] AnalyzerTestCo
4545

4646
ParseOptions parseOptions = GetParseOptions(context.DocumentationMode, context.LanguageName,
4747
context.OperationFeature);
48-
CompilationOptions compilationOptions = GetCompilationOptions(context.CompilerWarningLevel,
49-
context.LanguageName);
48+
CompilationOptions compilationOptions = GetCompilationOptions(context.CompilerWarningLevel, context.LanguageName);
5049

5150
Document document = new AdhocWorkspace()
5251
.AddProject(context.AssemblyName, context.LanguageName)
@@ -64,7 +63,7 @@ private ParseOptions GetParseOptions(DocumentationMode documentationMode, [NotNu
6463
{
6564
// Bug workaround: Setting DocumentationMode to a non-default value resets Features.
6665
ParseOptions optionsWithLostFeatures = languageName == LanguageNames.VisualBasic
67-
? (ParseOptions) DefaultBasicParseOptions.WithDocumentationMode(documentationMode)
66+
? (ParseOptions)DefaultBasicParseOptions.WithDocumentationMode(documentationMode)
6867
: DefaultCSharpParseOptions.WithDocumentationMode(documentationMode);
6968

7069
return operationFeature == OperationFeature.Enabled
@@ -92,8 +91,8 @@ public ICollection<string> RemoveMarkupFrom([NotNull] FixProviderTestContext con
9291
{
9392
Guard.NotNull(context, nameof(context));
9493

95-
return context.Expected.Select(text =>
96-
RemoveMarkupFrom(context.AnalyzerTestContext.WithMarkupCode(text), context.ReformatExpected))
94+
return context.Expected
95+
.Select(text => RemoveMarkupFrom(context.AnalyzerTestContext.WithMarkupCode(text), context.ReformatExpected))
9796
.ToList();
9897
}
9998

0 commit comments

Comments
 (0)