Merge pull request #17796 from jmarolf/bugfix/space-in-case-label

remove space from case.
dotnet · Mar 20, 2017 · 79fd024 · 79fd024
2 parents 551e4a5 + b408927
commit 79fd024
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 1 deletion.
diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
@@ -233,5 +233,61 @@ public static void TestNoRulesAreReturned()
             Assert.Empty(result.NamingStyles);
             Assert.Empty(result.SymbolSpecifications);
         }
+
+        [Fact]
+        public static void TestApplicableAccessibilitiesParse()
+        {
+            var charpRule = new Dictionary<string, object>()
+            {
+                ["dotnet_naming_rule.accessibilities_parse.severity"] = "error",
+                ["dotnet_naming_rule.accessibilities_parse.symbols"] = "accessibilities",
+                ["dotnet_naming_rule.accessibilities_parse.style"] = "pascal_case",
+                ["dotnet_naming_symbols.accessibilities.applicable_accessibilities"] = "internal,protected_internal",
+                ["dotnet_naming_style.pascal_case.capitalization "] = "pascal_case",
+            };
+            var vbRule = new Dictionary<string, object>()
+            {
+                ["dotnet_naming_rule.accessibilities_parse.severity"] = "error",
+                ["dotnet_naming_rule.accessibilities_parse.symbols"] = "accessibilities",
+                ["dotnet_naming_rule.accessibilities_parse.style"] = "pascal_case",
+                ["dotnet_naming_symbols.accessibilities.applicable_accessibilities"] = "friend,protected_friend",
+                ["dotnet_naming_style.pascal_case.capitalization "] = "pascal_case",
+            };
+
+            var csharpResult = ParseDictionary(charpRule);
+            var vbResult = ParseDictionary(vbRule);
+
+            Assert.Equal(csharpResult.SymbolSpecifications.SelectMany(x => x.ApplicableAccessibilityList),
+                         vbResult.SymbolSpecifications.SelectMany(x => x.ApplicableAccessibilityList));
+        }
+
+        [Fact]
+        public static void TestRequiredModifiersParse()
+        {
+            var charpRule = new Dictionary<string, object>()
+            {
+                ["dotnet_naming_rule.modifiers_parse.severity"] = "error",
+                ["dotnet_naming_rule.modifiers_parse.symbols"] = "modifiers",
+                ["dotnet_naming_rule.modifiers_parse.style"] = "pascal_case",
+                ["dotnet_naming_symbols.modifiers.required_modifiers"] = "abstract,static",
+                ["dotnet_naming_style.pascal_case.capitalization "] = "pascal_case",
+            };
+            var vbRule = new Dictionary<string, object>()
+            {
+                ["dotnet_naming_rule.modifiers_parse.severity"] = "error",
+                ["dotnet_naming_rule.modifiers_parse.symbols"] = "modifiers",
+                ["dotnet_naming_rule.modifiers_parse.style"] = "pascal_case",
+                ["dotnet_naming_symbols.modifiers.required_modifiers"] = "must_inherit,shared",
+                ["dotnet_naming_style.pascal_case.capitalization "] = "pascal_case",
+            };
+
+            var csharpResult = ParseDictionary(charpRule);
+            var vbResult = ParseDictionary(vbRule);
+
+            Assert.Equal(csharpResult.SymbolSpecifications.SelectMany(x => x.RequiredModifierList.Select(y => y.Modifier)),
+                         vbResult.SymbolSpecifications.SelectMany(x => x.RequiredModifierList.Select(y => y.Modifier)));
+            Assert.Equal(csharpResult.SymbolSpecifications.SelectMany(x => x.RequiredModifierList.Select(y => y.ModifierKindWrapper)),
+                         vbResult.SymbolSpecifications.SelectMany(x => x.RequiredModifierList.Select(y => y.ModifierKindWrapper)));
+        }
     }
 }
diff --git a/...paces/Core/Portable/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs b/...paces/Core/Portable/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
@@ -220,7 +220,7 @@ private static ImmutableArray<ModifierKind> ParseModifiers(string symbolSpecRequ
                 switch (symbolSpecRequiredModifier)
                 {
                     case "abstract":
-                    case "must_inherit ":
+                    case "must_inherit":
                         builder.Add(_abstractModifierKind);
                         break;
                     case "async":