Merge pull request #11640 from gibachan/fixit-nested-static-value

[Qol]Fixit nested static value

Author: slavapestov

lib/Sema/CSDiag.cpp

@@ -2560,7 +2560,7 @@ diagnoseTypeMemberOnInstanceLookup(Type baseObjTy,
       ->getAsNominalTypeOrNominalTypeExtensionContext();
   SmallString<32> typeName;
   llvm::raw_svector_ostream typeNameStream(typeName);
-  typeNameStream << nominal->getName() << ".";
+  typeNameStream << nominal->getSelfInterfaceType() << ".";
 
   Diag->fixItInsert(loc, typeNameStream.str());
   return;

test/Compatibility/dot_keywords.swift

@@ -0,0 +1,13 @@
+// RUN: %target-typecheck-verify-swift -swift-version 3
+
+// Static function in protocol should have `Self.` instead of its protocol name
+protocol P {}
+
+extension P {
+  static func f1() {}
+
+  func g() {
+    f1() // expected-error {{use of unresolved identifier 'f1'}}
+  }
+}
+

test/expr/postfix/dot/dot_keywords.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -swift-version 4
 
 let x: Int = 1
 let y: Int = x.self
@@ -77,3 +77,31 @@ class ClassWithDeinitMember {
 
 let instanceWithDeinitMember = ClassWithDeinitMember()
 _ = instanceWithDeinitMember.deinit
+
+
+// SR-5715 : Fix variable name in nested static value
+struct SR5715 {
+  struct A {
+    struct B {}
+  }
+}
+
+extension SR5715.A.B {
+  private static let x: Int = 5
+    
+  func f() -> Int {
+    return x  // expected-error {{static member 'x' cannot be used on instance of type 'SR5715.A.B'}} {{12-12=SR5715.A.B.}}
+  }
+}
+
+// Static function in protocol should have `Self.` instead of its protocol name
+protocol P {}
+
+extension P {
+  static func f() {}
+
+  func g() {
+    f() // expected-error {{static member 'f' cannot be used on instance of type 'Self'}} {{5-5=Self.}}
+  }
+}
+