Improve some variable names in SettingsHelper

bjornhellander · bjornhellander · commit 77c498d0b279 · 2023-04-10T09:53:16.000+02:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs
@@ -121,16 +121,16 @@ private static StyleCopSettings GetStyleCopSettings(AnalyzerOptions options, Syn
 
             if (tree != null)
             {
-                var optionsProvider = options.AnalyzerConfigOptionsProvider().GetOptions(tree);
-                return new StyleCopSettings(new JsonObject(), optionsProvider);
+                var analyzerConfigOptions = options.AnalyzerConfigOptionsProvider().GetOptions(tree);
+                return new StyleCopSettings(new JsonObject(), analyzerConfigOptions);
             }
 
             return new StyleCopSettings();
         }
 
         private static StyleCopSettings GetStyleCopSettings(AnalyzerOptions options, SyntaxTree tree, string path, SourceText text, DeserializationFailureBehavior failureBehavior)
         {
-            var optionsProvider = options.AnalyzerConfigOptionsProvider().GetOptions(tree);
+            var analyzerConfigOptions = options.AnalyzerConfigOptionsProvider().GetOptions(tree);
 
             try
             {
@@ -146,7 +146,7 @@ private static StyleCopSettings GetStyleCopSettings(AnalyzerOptions options, Syn
                 var settingsObject = rootValue.AsJsonObject["settings"];
                 if (settingsObject.IsJsonObject)
                 {
-                    return new StyleCopSettings(settingsObject.AsJsonObject, optionsProvider);
+                    return new StyleCopSettings(settingsObject.AsJsonObject, analyzerConfigOptions);
                 }
                 else if (settingsObject.IsNull)
                 {

Original file line number	Diff line number	Diff line change
`@@ -121,16 +121,16 @@ private static StyleCopSettings GetStyleCopSettings(AnalyzerOptions options, Syn`
`121`	`121`
`122`	`122`	`if (tree != null)`
`123`	`123`	`{`
`124`		`- var optionsProvider = options.AnalyzerConfigOptionsProvider().GetOptions(tree);`
`125`		`- return new StyleCopSettings(new JsonObject(), optionsProvider);`
	`124`	`+ var analyzerConfigOptions = options.AnalyzerConfigOptionsProvider().GetOptions(tree);`
	`125`	`+ return new StyleCopSettings(new JsonObject(), analyzerConfigOptions);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`return new StyleCopSettings();`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`private static StyleCopSettings GetStyleCopSettings(AnalyzerOptions options, SyntaxTree tree, string path, SourceText text, DeserializationFailureBehavior failureBehavior)`
`132`	`132`	`{`
`133`		`- var optionsProvider = options.AnalyzerConfigOptionsProvider().GetOptions(tree);`
	`133`	`+ var analyzerConfigOptions = options.AnalyzerConfigOptionsProvider().GetOptions(tree);`
`134`	`134`
`135`	`135`	`try`
`136`	`136`	`{`
`@@ -146,7 +146,7 @@ private static StyleCopSettings GetStyleCopSettings(AnalyzerOptions options, Syn`
`146`	`146`	`var settingsObject = rootValue.AsJsonObject["settings"];`
`147`	`147`	`if (settingsObject.IsJsonObject)`
`148`	`148`	`{`
`149`		`- return new StyleCopSettings(settingsObject.AsJsonObject, optionsProvider);`
	`149`	`+ return new StyleCopSettings(settingsObject.AsJsonObject, analyzerConfigOptions);`
`150`	`150`	`}`
`151`	`151`	`else if (settingsObject.IsNull)`
`152`	`152`	`{`