Formatting

Author: MikhailArkhipov

src/Analysis/Engine/Impl/OverloadResult.cs

@@ -16,12 +16,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.PythonTools.Analysis.Infrastructure;
-using Microsoft.PythonTools.Analysis.Values;
 using Microsoft.PythonTools.Interpreter;
 
 namespace Microsoft.PythonTools.Analysis {
@@ -63,7 +61,7 @@ private static IEnumerable<string> CommaSplit(string x) {
             }
 
             var sb = new StringBuilder();
-            int nestCount = 0;
+            var nestCount = 0;
             foreach (var c in x) {
                 if (c == ',' && nestCount == 0) {
                     yield return sb.ToString().Trim();
@@ -95,7 +93,7 @@ public static OverloadResult Merge(IEnumerable<OverloadResult> overloads) {
             var parameters = overloads.Select(o => o.Parameters).Aggregate(Array.Empty<ParameterResult>(), (all, pms) => {
                 var res = all.Concat(pms.Skip(all.Length)).ToArray();
 
-                for (int i = 0; i < res.Length; ++i) {
+                for (var i = 0; i < res.Length; ++i) {
                     if (res[i] == null) {
                         res[i] = pms[i];
                     } else {
@@ -179,16 +177,6 @@ private string ChooseBest(string x, string y) {
             return x.Length >= y.Length ? x : y;
         }
 
-        private IAnalysisSet ChooseBest(IAnalysisSet x, IAnalysisSet y) {
-            if (x == null || x.IsObjectOrUnknown()) {
-                return (y == null || y.IsObjectOrUnknown()) ? AnalysisSet.Empty : y;
-            }
-            if (y == null || y.IsObjectOrUnknown()) {
-                return AnalysisSet.Empty;
-            }
-            return x.Union(y);
-        }
-
         public bool TryAddOverload(string name, string documentation, string[] names, string[] types, string[] defaults, IEnumerable<string> returnTypes) {
             if (names.Length != _pnames.Length || types.Length != _ptypes.Length) {
                 return false;
@@ -225,7 +213,7 @@ public bool TryAddOverload(string name, string documentation, string[] names, st
 
         public OverloadResult ToOverloadResult() {
             var parameters = new ParameterResult[_pnames.Length];
-            for (int i = 0; i < parameters.Length; ++i) {
+            for (var i = 0; i < parameters.Length; ++i) {
                 if (string.IsNullOrEmpty(_pnames[i])) {
                     return null;
                 }
@@ -328,15 +316,15 @@ private void DocCalculator() {
             }
 
             foreach (var param in _overload.GetParameters()) {
-                if (!String.IsNullOrEmpty(param.Documentation)) {
+                if (!string.IsNullOrEmpty(param.Documentation)) {
                     doc.AppendLine();
                     doc.Append(param.Name);
                     doc.Append(": ");
                     doc.Append(param.Documentation);
                 }
             }
 
-            if (!String.IsNullOrEmpty(_overload.ReturnDocumentation)) {
+            if (!string.IsNullOrEmpty(_overload.ReturnDocumentation)) {
                 doc.AppendLine();
                 doc.AppendLine();
                 doc.Append("Returns: ");
@@ -359,7 +347,7 @@ public override ParameterResult[] Parameters {
 
                         var pinfo = _overload.GetParameters();
                         var result = new List<ParameterResult>(pinfo.Length + _extraParameters.Length);
-                        int ignored = 0;
+                        var ignored = 0;
                         ParameterResult kwDict = null;
                         foreach (var param in pinfo) {
                             if (ignored < _removedParams) {
@@ -392,7 +380,7 @@ public override ParameterResult[] Parameters {
         }
 
         internal ParameterResult GetParameterResultFromParameterInfo(IParameterInfo param) {
-            string name = param.Name;
+            var name = param.Name;
 
             string typeName;
             if (param.ParameterTypes != null) {
@@ -402,8 +390,7 @@ internal ParameterResult GetParameterResultFromParameterInfo(IParameterInfo para
             }
             if (param.IsParamArray) {
                 name = "*" + name;
-                var advType = param.ParameterTypes as IAdvancedPythonType;
-                if (advType != null && advType.IsArray) {
+                if (param.ParameterTypes is IAdvancedPythonType advType && advType.IsArray) {
                     var elemType = advType.GetElementType();
                     if (elemType == _projectState.Types[BuiltinTypeId.Object]) {
                         typeName = "sequence";
@@ -416,8 +403,8 @@ internal ParameterResult GetParameterResultFromParameterInfo(IParameterInfo para
                 typeName = "object";
             }
 
-            bool isOptional = false;
-            string defaultValue = param.DefaultValue;
+            var isOptional = false;
+            var defaultValue = param.DefaultValue;
             if (defaultValue != null && defaultValue.Length == 0) {
                 isOptional = true;
                 defaultValue = null;
@@ -456,7 +443,7 @@ public override bool Equals(OverloadResult x, OverloadResult y) {
                 return false;
             }
 
-            for (int i = 0; i < x.Parameters.Length; ++i) {
+            for (var i = 0; i < x.Parameters.Length; ++i) {
                 if (_weak) {
                     if (!x.Parameters[i].Name.Equals(y.Parameters[i].Name)) {
                         return false;
@@ -474,7 +461,7 @@ public override bool Equals(OverloadResult x, OverloadResult y) {
         public override int GetHashCode(OverloadResult obj) {
             // Don't use Documentation for hash code, since it changes over time
             // in some implementations of IOverloadResult.
-            int hc = 552127 ^ obj.Name.GetHashCode();
+            var hc = 552127 ^ obj.Name.GetHashCode();
             if (obj.Parameters != null) {
                 foreach (var p in obj.Parameters) {
                     hc ^= _weak ? p.Name.GetHashCode() : p.GetHashCode();