Use better checking for special types in PutInsideUsing & IterateViaF…

…oreach
icsharpcode · Sep 1, 2015 · 9c89819 · 9c89819
1 parent 74fba28
commit 9c89819
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/RefactoringEssentials/CSharp/CodeRefactorings/Uncategorized/PutInsideUsingAction.cs b/RefactoringEssentials/CSharp/CodeRefactorings/Uncategorized/PutInsideUsingAction.cs
@@ -28,7 +28,7 @@ protected override IEnumerable<CodeAction> GetActions(Document document, Semanti
             if (symbol == null)
                 yield break;
 
-            if (!IsDisposable(semanticModel, symbol.Type))
+            if (!symbol.Type.ImplementsSpecialTypeInterface(SpecialType.System_IDisposable))
                 yield break;
 
             var containingBlock = node.GetAncestor<BlockSyntax>();
@@ -185,20 +185,5 @@ private static bool IsEndingWithDispose(SemanticModel semanticModel, List<Statem
 
             return true;
         }
-
-        private static bool IsDisposable(SemanticModel semanticModel, ITypeSymbol type)
-        {
-            var disposable = semanticModel.Compilation.GetSpecialType(SpecialType.System_IDisposable);
-
-            if (type.GetAllInterfacesIncludingThis().Contains(disposable))
-                return true;
-
-            var parameterType = type as ITypeParameterSymbol;
-
-            if (parameterType != null && parameterType.ConstraintTypes.Any(x => IsDisposable(semanticModel, x)))
-                return true;
-
-            return false;
-        }
     }
 }
diff --git a/RefactoringEssentials/Util/ITypeSymbolExtensions.cs b/RefactoringEssentials/Util/ITypeSymbolExtensions.cs
@@ -1147,8 +1147,8 @@ public static ITypeSymbol RemoveNullableIfPresent(this ITypeSymbol symbol)
         }
 
         public static bool IsIEnumerable(this ITypeSymbol typeSymbol)
-        {            
-            return typeSymbol.GetAllInterfacesIncludingThis().Any(x => x.SpecialType == SpecialType.System_Collections_IEnumerable);
+        {
+            return typeSymbol.ImplementsSpecialTypeInterface(SpecialType.System_Collections_IEnumerable);
         }
     }
 }