Address comments

Author: aibaars

ql/src/codeql_ruby/ast/Variable.qll

@@ -163,7 +163,6 @@ class VariableReadAccess extends VariableAccess {
 class LocalVariableAccess extends VariableAccess, @token_identifier {
   final override LocalVariableAccess::Range range;
 
-  /** Gets the variable this identifier refers to. */
   final override LocalVariable getVariable() { result = range.getVariable() }
 
   final override string getAPrimaryQlClass() {
@@ -198,7 +197,6 @@ class LocalVariableReadAccess extends LocalVariableAccess, VariableReadAccess {
 class GlobalVariableAccess extends VariableAccess, @token_global_variable {
   final override GlobalVariableAccess::Range range;
 
-  /** Gets the variable this identifier refers to. */
   final override GlobalVariable getVariable() { result = range.getVariable() }
 
   final override string getAPrimaryQlClass() { result = "GlobalVariableAccess" }
@@ -214,7 +212,6 @@ class GlobalVariableReadAccess extends GlobalVariableAccess, VariableReadAccess
 class InstanceVariableAccess extends VariableAccess, @token_instance_variable {
   final override InstanceVariableAccess::Range range;
 
-  /** Gets the variable this identifier refers to. */
   final override InstanceVariable getVariable() { result = range.getVariable() }
 
   final override string getAPrimaryQlClass() { result = "InstanceVariableAccess" }
@@ -224,7 +221,6 @@ class InstanceVariableAccess extends VariableAccess, @token_instance_variable {
 class ClassVariableAccess extends VariableAccess, @token_class_variable {
   final override ClassVariableAccess::Range range;
 
-  /** Gets the variable this identifier refers to. */
   final override ClassVariable getVariable() { result = range.getVariable() }
 
   final override string getAPrimaryQlClass() { result = "ClassVariableAccess" }

ql/src/codeql_ruby/ast/internal/Variable.qll

@@ -14,36 +14,41 @@ private predicate instanceVariableAccess(
 ) {
   name = var.getValue() and
   scope = enclosingModuleOrClass(var) and
-  if
-    exists(VariableScope method |
-      method = enclosingMethod(var) and scope = enclosingScope(method.getScopeElement())
-    )
-  then instance = true
-  else instance = false
+  if exists(enclosingMethod(var)) then instance = true else instance = false
 }
 
 private predicate classVariableAccess(Generated::ClassVariable var, string name, VariableScope scope) {
   name = var.getValue() and
   scope = enclosingModuleOrClass(var)
 }
 
-private VariableScope enclosingMethod(Generated::AstNode node) {
-  exists(VariableScope scope, Callable c |
-    scope = outerScope*(enclosingScope(node)) and
-    scope = TCallableScope(c) and
-    (c instanceof Method or c instanceof SingletonMethod) and
-    result = scope
+private Callable enclosingMethod(Generated::AstNode node) {
+  parentCallableScope*(enclosingScope(node)) = TCallableScope(result) and
+  (
+    result instanceof Method or
+    result instanceof SingletonMethod
   )
 }
 
-private VariableScope enclosingModuleOrClass(Generated::AstNode node) {
-  exists(VariableScope scope | scope = enclosingScope(node) |
-    if scope instanceof ModuleOrClassScope
-    then result = scope
-    else result = enclosingModuleOrClass(scope.getScopeElement())
+private TCallableScope parentCallableScope(TCallableScope scope) {
+  exists(Callable c |
+    scope = TCallableScope(c) and
+    not c instanceof Method and
+    not c instanceof SingletonMethod
+  |
+    result = outerScope(scope)
   )
 }
 
+private VariableScope parentScope(VariableScope scope) {
+  not scope instanceof ModuleOrClassScope and
+  result = outerScope(scope)
+}
+
+private ModuleOrClassScope enclosingModuleOrClass(Generated::AstNode node) {
+  result = parentScope*(enclosingScope(node))
+}
+
 private predicate parameterAssignment(
   CallableScope::Range scope, string name, Generated::Identifier i
 ) {