Address review comments

Author: hvitved

unified/ql/lib/codeql/unified/internal/LocalNameBinding.qll

@@ -333,6 +333,12 @@ private module LocalNameBindingInput implements LocalNameBindingInputSig<Locatio
       name = any(NameBindingPlugin p).getImplicitReceiverParameterName(callable) and
       scope = callable
     )
+    or
+    exists(ClassLikeDeclaration cls |
+      isLocalVariable = false and
+      name = any(NameBindingPlugin p).getStaticSelfName(cls) and
+      scope = cls
+    )
   }
 
   predicate implicitDeclInScope(string name, AstNode scope) { implicitDeclInScope(name, scope, _) }

unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll

@@ -44,10 +44,11 @@ class NameBindingPlugin extends Unit {
   string getImplicitReceiverParameterName(Callable callable) { none() }
 
   /**
-   * Gets the name through which static members of the enclosing class can be
+   * Gets the name through which static members of the enclosing class `cls` can be
    * accessed, for example `Self` in Swift.
    */
-  string getStaticSelfName() { none() }
+  bindingset[cls]
+  string getStaticSelfName(ClassLikeDeclaration cls) { none() }
 }
 
 /** Holds if `member` is an instance member. */

unified/ql/lib/codeql/unified/internal/NameBindingPluginSwift.qll

@@ -45,7 +45,8 @@ class NameBindingPluginSwift extends NameBindingPlugin {
     result = "self"
   }
 
-  override string getStaticSelfName() { result = "Self" }
+  bindingset[cls]
+  override string getStaticSelfName(ClassLikeDeclaration cls) { exists(cls) and result = "Self" }
 }
 
 /** Holds if `node` is in a context where a bare name node should be seen as a reference rather than a declaration. */

unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll

@@ -210,12 +210,6 @@ predicate storeStep(NameBindingNode node1, string name, NameBindingNode node2) {
   )
   or
   FolderHeuristic::storeStep(node1, name, node2)
-  or
-  exists(ClassLikeDeclaration cls |
-    name = any(NameBindingPlugin p).getStaticSelfName() and
-    node1.isIdentifier(cls.getNameNode()) and
-    node2.isStaticMemberNamespace(cls)
-  )
 }
 
 predicate valueStep(NameBindingNode node1, NameBindingNode node2) {
@@ -269,6 +263,12 @@ predicate valueStep(NameBindingNode node1, NameBindingNode node2) {
   )
   or
   FolderHeuristic::valueStep(node1, node2)
+  or
+  exists(ClassLikeDeclaration cls, LocalNameBindingOutput::ImplicitLocal self |
+    node1.isIdentifier(cls.getNameNode()) and
+    node2.isLocalName(self) and
+    self.hasNameAndScope(any(NameBindingPlugin p).getStaticSelfName(cls), cls)
+  )
 }
 
 private predicate isImportPrefix(Expr e) {

unified/ql/test/library-tests/static-name-binding/explicit-instance-field-access.swift

@@ -50,6 +50,6 @@ private class C {
     static let x = 1
     class D {
         static let x = 2
-        static let foo = Self.x // $ access=C.D access=C.D.x $ SPURIOUS: access=C.x
+        static let foo = Self.x // $ access=C.D access=C.D.x
     }
 }