Merge pull request #3762 from kvpt/fix_directive_placement_setting

Fix csharp_using_directive_placement setting retrieval
DotNetAnalyzers · Dec 27, 2023 · 73b34ac · 73b34ac
2 parents 1b5a75a + d0ad21f
commit 73b34ac
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/Settings/SettingsCSharp8UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/Settings/SettingsCSharp8UnitTests.cs
@@ -5,6 +5,7 @@
 
 namespace StyleCop.Analyzers.Test.CSharp8.Settings
 {
+    using System;
     using System.Collections.Immutable;
     using System.Threading;
     using System.Threading.Tasks;
@@ -172,6 +173,30 @@ public async Task VerifyInvalidReferenceBehaviorFromEditorConfigAsync()
             Assert.Equal("[InvalidReference]", styleCopSettings.DocumentationRules.GetCopyrightText("unused"));
         }
 
+        [Theory]
+        [InlineData("outside_namespace")]
+        [InlineData("inside_namespace")]
+        public async Task VerifyEditorConfigSettingsReadCorrectlyDirectivePlacementWithoutSeverityLevelAsync(string placement)
+        {
+            var expected = placement switch
+            {
+                "outside_namespace" => UsingDirectivesPlacement.OutsideNamespace,
+                "inside_namespace" => UsingDirectivesPlacement.InsideNamespace,
+                _ => throw new InvalidOperationException(),
+            };
+            var settings = $@"root = true
+
+[*]
+csharp_using_directive_placement = {placement}
+";
+            var context = await this.CreateAnalysisContextFromEditorConfigAsync(settings).ConfigureAwait(false);
+
+            var styleCopSettings = context.GetStyleCopSettings(CancellationToken.None);
+
+            Assert.NotNull(styleCopSettings.OrderingRules);
+            Assert.Equal(expected, styleCopSettings.OrderingRules.UsingDirectivesPlacement);
+        }
+
         protected virtual AnalyzerConfigOptionsProvider CreateAnalyzerConfigOptionsProvider(AnalyzerConfigSet analyzerConfigSet)
             => new TestAnalyzerConfigOptionsProvider(analyzerConfigSet);
 

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/AnalyzerConfigHelper.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/AnalyzerConfigHelper.cs
@@ -71,6 +71,8 @@ internal static string TryGetMultiLineStringValue(AnalyzerConfigOptionsWrapper a
                 {
                     return new KeyValuePair<string, string>(value.Substring(0, colonIndex), value.Substring(colonIndex + 1));
                 }
+
+                return new KeyValuePair<string, string>(value, string.Empty);
             }
 
             return null;