diff --git a/‎csharp/ql/lib/semmle/code/csharp/Assignable.qll‎
Lines changed: 16 additions & 3 deletions b/‎csharp/ql/lib/semmle/code/csharp/Assignable.qll‎
Lines changed: 16 additions & 3 deletions
@@ -277,15 +277,28 @@ module AssignableInternal {
     def = TParameterDefaultDefinition(_, result)
   }
 
-  /** A local variable declaration at the top-level of a pattern. */
-  class TopLevelPatternDecl extends LocalVariableDeclExpr {
+  /** A pattern containing a local variable declaration. */
+  class LocalVariablePatternDecl extends LocalVariableDeclExpr {
     private PatternMatch pm;
 
-    TopLevelPatternDecl() { this = pm.getPattern().(BindingPatternExpr).getVariableDeclExpr() }
+    LocalVariablePatternDecl() {
+      exists(BindingPatternExpr bpe |
+        this = bpe.getVariableDeclExpr() and pm = bpe.getPatternMatch()
+      )
+    }
+
+    /** Holds if the local variable definition is at the top level of the pattern. */
+    predicate isTopLevel() { this = pm.getPattern().(BindingPatternExpr).getVariableDeclExpr() }
 
+    /** Gets the pattern match that this local variable declaration (pattern) belongs to. */
     PatternMatch getMatch() { result = pm }
   }
 
+  /** A local variable declaration at the top-level of a pattern. */
+  class TopLevelPatternDecl extends LocalVariablePatternDecl {
+    TopLevelPatternDecl() { this.isTopLevel() }
+  }
+
   cached
   private module Cached {
     cached