Revert several changes

sharwell · sharwell · commit 05f836075aef · 2017-05-29T08:54:14.000-05:00
* Require new JSON parser not break existing settings files
* Allow unrecognized settings
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/NoXmlFileHeaderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/NoXmlFileHeaderUnitTests.cs
@@ -25,7 +25,7 @@ public class NoXmlFileHeaderUnitTests : CodeFixVerifier
       ""copyrightText"": ""Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information."",
       ""variables"": {
         ""licenseName"": ""???"",
-        ""licenseFile"": ""LICENSE""
+        ""licenseFile"": ""LICENSE"",
       },
       ""xmlHeader"": false
     }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1203UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1203UnitTests.cs
@@ -448,7 +448,7 @@ protected override string GetSettings()
         ""kind"",
         ""constant"",
         ""static"",
-        ""readonly""
+        ""readonly"",
       ]
     }
   }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -16,8 +16,6 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/DocumentationSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/DocumentationSettings.cs
@@ -141,7 +141,7 @@ protected internal DocumentationSettings(JsonObject documentationSettingsObject)
 
                         if (!Regex.IsMatch(name, "^[a-zA-Z0-9]+$"))
                         {
-                            throw new InvalidSettingsException($"{name} contains invalid characters");
+                            continue;
                         }
 
                         string value = child.ToStringValue();
@@ -160,7 +160,7 @@ protected internal DocumentationSettings(JsonObject documentationSettingsObject)
                     break;
 
                 default:
-                    throw new InvalidSettingsException($"documentationRules should not contain a child named {kvp.Key}");
+                    break;
                 }
             }
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/LayoutSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/LayoutSettings.cs
@@ -36,7 +36,7 @@ protected internal LayoutSettings(JsonObject layoutSettingsObject)
                     break;
 
                 default:
-                    throw new InvalidSettingsException($"layoutRules should not contain a child named {kvp.Key}");
+                    break;
                 }
             }
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/MaintainabilitySettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/MaintainabilitySettings.cs
@@ -21,10 +21,6 @@ protected internal MaintainabilitySettings()
         protected internal MaintainabilitySettings(JsonObject maintainabilitySettingsObject)
             : this()
         {
-            if (maintainabilitySettingsObject.Count > 0)
-            {
-                throw new InvalidSettingsException($"maintainabilityRules should not contain any child objects");
-            }
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/NamingSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/NamingSettings.cs
@@ -51,7 +51,7 @@ protected internal NamingSettings(JsonObject namingSettingsObject)
 
                         if (!Regex.IsMatch(prefix, "^[a-z]{1,2}$"))
                         {
-                            throw new InvalidSettingsException($"{kvp.Key} contains an invalid prefix.");
+                            continue;
                         }
 
                         this.allowedHungarianPrefixes.Add(prefix);
@@ -60,7 +60,7 @@ protected internal NamingSettings(JsonObject namingSettingsObject)
                     break;
 
                 default:
-                    throw new InvalidSettingsException($"namingRules should not contain a child named {kvp.Key}");
+                    break;
                 }
             }
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/OrderingSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/OrderingSettings.cs
@@ -71,7 +71,7 @@ protected internal OrderingSettings(JsonObject orderingSettingsObject)
                     break;
 
                 default:
-                    throw new InvalidSettingsException($"orderingRules should not contain a child named {kvp.Key}");
+                    break;
                 }
             }
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/ReadabilitySettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/ReadabilitySettings.cs
@@ -21,10 +21,6 @@ protected internal ReadabilitySettings()
         protected internal ReadabilitySettings(JsonObject readabilitySettingsObject)
             : this()
         {
-            if (readabilitySettingsObject.Count > 0)
-            {
-                throw new InvalidSettingsException($"readabilityRules should not contain any child objects");
-            }
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/SpacingSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/SpacingSettings.cs
@@ -21,10 +21,6 @@ protected internal SpacingSettings()
         protected internal SpacingSettings(JsonObject spacingSettingsObject)
             : this()
         {
-            if (spacingSettingsObject.Count > 0)
-            {
-                throw new InvalidSettingsException($"spacingRules should not contain any child objects");
-            }
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/StyleCopSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/StyleCopSettings.cs
@@ -61,39 +61,46 @@ protected internal StyleCopSettings(JsonObject settingsObject)
         {
             foreach (var kvp in settingsObject)
             {
-                if (!kvp.Value.IsJsonObject)
-                {
-                    throw new InvalidSettingsException("settings can only contain objects");
-                }
-
                 var childSettingsObject = kvp.Value.AsJsonObject;
-
                 switch (kvp.Key)
                 {
                 case "spacingRules":
+                    kvp.AssertIsObject();
                     this.spacingRules = new SpacingSettings(childSettingsObject);
                     break;
+
                 case "readabilityRules":
+                    kvp.AssertIsObject();
                     this.readabilityRules = new ReadabilitySettings(childSettingsObject);
                     break;
+
                 case "orderingRules":
+                    kvp.AssertIsObject();
                     this.orderingRules = new OrderingSettings(childSettingsObject);
                     break;
+
                 case "namingRules":
+                    kvp.AssertIsObject();
                     this.namingRules = new NamingSettings(childSettingsObject);
                     break;
+
                 case "maintainabilityRules":
+                    kvp.AssertIsObject();
                     this.maintainabilityRules = new MaintainabilitySettings(childSettingsObject);
                     break;
+
                 case "layoutRules":
+                    kvp.AssertIsObject();
                     this.layoutRules = new LayoutSettings(childSettingsObject);
                     break;
+
                 case "documentationRules":
+                    kvp.AssertIsObject();
                     this.documentationRules = new DocumentationSettings(childSettingsObject);
                     break;
 
                 default:
-                    throw new InvalidSettingsException($"settings should not contain child object '{kvp.Key}'");
+                    break;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class NoXmlFileHeaderUnitTests : CodeFixVerifier`
`25`	`25`	`""copyrightText"": ""Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information."",`
`26`	`26`	`""variables"": {`
`27`	`27`	`""licenseName"": ""???"",`
`28`		`- ""licenseFile"": ""LICENSE""`
	`28`	`+ ""licenseFile"": ""LICENSE"",`
`29`	`29`	`},`
`30`	`30`	`""xmlHeader"": false`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ protected override string GetSettings()`
`448`	`448`	`""kind"",`
`449`	`449`	`""constant"",`
`450`	`450`	`""static"",`
`451`		`- ""readonly""`
	`451`	`+ ""readonly"",`
`452`	`452`	`]`
`453`	`453`	`}`
`454`	`454`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ protected internal DocumentationSettings(JsonObject documentationSettingsObject)`
`141`	`141`
`142`	`142`	`if (!Regex.IsMatch(name, "^[a-zA-Z0-9]+$"))`
`143`	`143`	`{`
`144`		`- throw new InvalidSettingsException($"{name} contains invalid characters");`
	`144`	`+ continue;`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`string value = child.ToStringValue();`
`@@ -160,7 +160,7 @@ protected internal DocumentationSettings(JsonObject documentationSettingsObject)`
`160`	`160`	`break;`
`161`	`161`
`162`	`162`	`default:`
`163`		`- throw new InvalidSettingsException($"documentationRules should not contain a child named {kvp.Key}");`
	`163`	`+ break;`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected internal LayoutSettings(JsonObject layoutSettingsObject)`
`36`	`36`	`break;`
`37`	`37`
`38`	`38`	`default:`
`39`		`- throw new InvalidSettingsException($"layoutRules should not contain a child named {kvp.Key}");`
	`39`	`+ break;`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@ protected internal MaintainabilitySettings()`
`21`	`21`	`protected internal MaintainabilitySettings(JsonObject maintainabilitySettingsObject)`
`22`	`22`	`: this()`
`23`	`23`	`{`
`24`		`- if (maintainabilitySettingsObject.Count > 0)`
`25`		`- {`
`26`		`- throw new InvalidSettingsException($"maintainabilityRules should not contain any child objects");`
`27`		`- }`
`28`	`24`	`}`
`29`	`25`	`}`
`30`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected internal NamingSettings(JsonObject namingSettingsObject)`
`51`	`51`
`52`	`52`	`if (!Regex.IsMatch(prefix, "^[a-z]{1,2}$"))`
`53`	`53`	`{`
`54`		`- throw new InvalidSettingsException($"{kvp.Key} contains an invalid prefix.");`
	`54`	`+ continue;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`this.allowedHungarianPrefixes.Add(prefix);`
`@@ -60,7 +60,7 @@ protected internal NamingSettings(JsonObject namingSettingsObject)`
`60`	`60`	`break;`
`61`	`61`
`62`	`62`	`default:`
`63`		`- throw new InvalidSettingsException($"namingRules should not contain a child named {kvp.Key}");`
	`63`	`+ break;`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected internal OrderingSettings(JsonObject orderingSettingsObject)`
`71`	`71`	`break;`
`72`	`72`
`73`	`73`	`default:`
`74`		`- throw new InvalidSettingsException($"orderingRules should not contain a child named {kvp.Key}");`
	`74`	`+ break;`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@ protected internal ReadabilitySettings()`
`21`	`21`	`protected internal ReadabilitySettings(JsonObject readabilitySettingsObject)`
`22`	`22`	`: this()`
`23`	`23`	`{`
`24`		`- if (readabilitySettingsObject.Count > 0)`
`25`		`- {`
`26`		`- throw new InvalidSettingsException($"readabilityRules should not contain any child objects");`
`27`		`- }`
`28`	`24`	`}`
`29`	`25`	`}`
`30`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@ protected internal SpacingSettings()`
`21`	`21`	`protected internal SpacingSettings(JsonObject spacingSettingsObject)`
`22`	`22`	`: this()`
`23`	`23`	`{`
`24`		`- if (spacingSettingsObject.Count > 0)`
`25`		`- {`
`26`		`- throw new InvalidSettingsException($"spacingRules should not contain any child objects");`
`27`		`- }`
`28`	`24`	`}`
`29`	`25`	`}`
`30`	`26`	`}`