Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
chsienki committed Dec 8, 2020
1 parent 2a64b0b commit 1dce77f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2201,7 +2201,7 @@ public void GlobalLevelCanBeReadFromAnyConfig()
[Fact]
public void GlobalLevelDefaultsTo100ForUserGlobalConfigs()
{
var config = Parse("", "/"+AnalyzerConfig.UserGlobalConfigName);
var config = Parse("", "/" + AnalyzerConfig.UserGlobalConfigName);

Assert.True(config.IsGlobal);
Assert.Equal(100, config.GlobalLevel);
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/Core/Portable/CommandLine/AnalyzerConfigSet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -587,15 +587,15 @@ private void MergeSection(string configPath, Section section, int globalLevel, b
if ((!keyInSection && !keyDuplicated) // this key is neither present nor a duplicate, we can add it
|| (keyInSection && sectionDict[key].globalLevel < globalLevel) // this key should override the existing section one
|| (keyDuplicated && duplicateDict![key].globalLevel < globalLevel)) // this key should override previous duplicates
{
{
sectionDict[key] = (value, configPath, globalLevel);

if (keyDuplicated)
{
duplicateDict!.Remove(key);
}
}
else if((keyDuplicated && duplicateDict![key].globalLevel == globalLevel) // this key is another duplicate at the same level
else if ((keyDuplicated && duplicateDict![key].globalLevel == globalLevel) // this key is another duplicate at the same level
|| (keyInSection && sectionDict[key].globalLevel == globalLevel)) // this key is a duplicate of a current section key
{
if (duplicateDict is null)
Expand Down

0 comments on commit 1dce77f

Please sign in to comment.