C#: Simplify the isCollectionType predicate.

michaelnebel · michaelnebel · commit b95a332dedb8 · 2022-03-22T11:25:14.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/Collections.qll b/csharp/ql/lib/semmle/code/csharp/commons/Collections.qll
@@ -2,7 +2,6 @@
 
 import csharp
 import semmle.code.csharp.frameworks.system.Collections
-import semmle.code.csharp.frameworks.system.collections.Generic
 
 private string modifyMethodName() {
   result =
@@ -70,11 +69,8 @@ class CollectionType extends RefType {
 
 /** Holds if `t` is a collection type. */
 predicate isCollectionType(ValueOrRefType t) {
-  not t instanceof StringType and
-  exists(ValueOrRefType base | base = t.getABaseType*() |
-    base instanceof SystemCollectionsGenericIEnumerableTInterface or
-    base instanceof SystemCollectionsIEnumerableInterface
-  )
+  t.getABaseType*() instanceof SystemCollectionsIEnumerableInterface and
+  not t instanceof StringType
 }
 
 /** An object creation that creates an empty collection. */
