From b2fbeee7946773d46405ae70bb02ffbf3a6485e1 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Fri, 26 Feb 2021 19:04:33 +0100
Subject: [PATCH] CFG: hide all non-AstNodes

---
 .../internal/ControlFlowGraphImpl.qll         | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
index dd1d30430b2..931f7020666 100644
--- a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -206,24 +206,9 @@ private predicate succImpl(AstNode pred, AstNode succ, Completion c) {
 }
 
 private predicate isHidden(ControlFlowTree t) {
+  not t instanceof ASTInternal::AstNode::Range
+  or
   t.isHidden()
-  or
-  t = any(Method m).getName()
-  or
-  t = any(Class m).getName()
-  or
-  t = any(Module m).getName()
-  or
-  t = any(ScopeResolution m).getName()
-  or
-  t = any(SingletonMethod m).getName()
-  or
-  t = any(Call c).getMethod() and
-  not t instanceof ScopeResolution
-  or
-  t instanceof RestAssignment
-  or
-  t instanceof Superclass
 }
 
 private predicate succImplIfHidden(AstNode pred, AstNode succ) {