AST: Rename ExtensionImportVisibility to MemberImportVisibility.

This feature controls lookup behavior for members in general, not just
extension members.

Resolves rdar://126491324

Author: tshortli

include/swift/Basic/Features.def

@@ -364,8 +364,8 @@ EXPERIMENTAL_FEATURE(ClosureIsolation, true)
 // Enable isolated(any) attribute on function types.
 CONDITIONALLY_SUPPRESSIBLE_EXPERIMENTAL_FEATURE(IsolatedAny, true)
 
-// Whether members of extensions respect the enclosing file's imports.
-EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE(ExtensionImportVisibility, true)
+// Whether lookup of members respects the enclosing file's imports.
+EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE(MemberImportVisibility, true)
 
 // Alias for IsolatedAny
 EXPERIMENTAL_FEATURE(IsolatedAny2, true)

lib/AST/FeatureSet.cpp

@@ -680,7 +680,7 @@ static bool usesFeatureIsolatedAny(Decl *decl) {
   });
 }
 
-UNINTERESTING_FEATURE(ExtensionImportVisibility)
+UNINTERESTING_FEATURE(MemberImportVisibility)
 UNINTERESTING_FEATURE(IsolatedAny2)
 
 UNINTERESTING_FEATURE(ObjCImplementation)

lib/AST/NameLookup.cpp

@@ -2293,7 +2293,7 @@ static bool isAcceptableLookupResult(const DeclContext *dc,
     // makes this decl visible.
     if (decl->getDeclContext()->getParentModule() != dc->getParentModule() &&
         dc->getASTContext().LangOpts.hasFeature(
-            Feature::ExtensionImportVisibility) &&
+            Feature::MemberImportVisibility) &&
         !decl->findImport(dc))
       return false;
   }

test/NameLookup/Inputs/extensions_A.swift renamed to test/NameLookup/Inputs/members_A.swift

@@ -1,4 +1,4 @@
-import extensions_A
+import members_A
 
 
 extension X {

test/NameLookup/Inputs/extensions_B.swift renamed to test/NameLookup/Inputs/members_B.swift

@@ -1,5 +1,5 @@
-@_exported import extensions_A
-import extensions_B
+@_exported import members_A
+import members_B
 
 
 extension X {

test/NameLookup/Inputs/extensions_C.swift renamed to test/NameLookup/Inputs/members_C.swift

@@ -1,25 +1,25 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/extensions_A.swift
-// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/extensions_B.swift
-// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/extensions_C.swift
-// RUN: %target-swift-frontend -typecheck %s -I %t -verify -enable-experimental-feature ExtensionImportVisibility
+// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/members_A.swift
+// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/members_B.swift
+// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/members_C.swift
+// RUN: %target-swift-frontend -typecheck %s -I %t -verify -enable-experimental-feature MemberImportVisibility
 
-import extensions_C
-// expected-note 2{{add import of module 'extensions_B'}}{{1-1=import extensions_B\n}}
+import members_C
+// expected-note 2{{add import of module 'members_B'}}{{1-1=import members_B\n}}
 func test(x: X, y: Y<Z>) {
-  // Declared in extensions_A
+  // Declared in members_A
   x.XinA()
   y.YinA()
   _ = x <<< x
   _ = y <<< y
 
-  // Declared in extensions_B
-  x.XinB() // expected-error{{instance method 'XinB()' is not available due to missing import of defining module 'extensions_B'}}
-  y.YinB() // expected-error{{instance method 'YinB()' is not available due to missing import of defining module 'extensions_B'}}
+  // Declared in members_B
+  x.XinB() // expected-error{{instance method 'XinB()' is not available due to missing import of defining module 'members_B'}}
+  y.YinB() // expected-error{{instance method 'YinB()' is not available due to missing import of defining module 'members_B'}}
   _ = x >>> x // expected-error{{cannot find operator '>>>' in scope}}
   _ = y >>> y // expected-error{{cannot find operator '>>>' in scope}}
 
-  // Declared in extensions_C
+  // Declared in members_C
   x.XinC()
   y.YinC()
   _ = x <> x

test/NameLookup/extensions_transitive.swift renamed to test/NameLookup/members_transitive.swift

@@ -3,7 +3,7 @@
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_B.swift
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_C.swift
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_E.swift
-// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -verify -enable-experimental-feature ExtensionImportVisibility
+// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -verify -enable-experimental-feature MemberImportVisibility
 
 // REQUIRES: objc_interop
 
@@ -29,7 +29,7 @@ func testAnyObject(a: AnyObject) {
   a.fromOverlayForBObjC()
   // FIXME: Better diagnostics?
   // Name lookup for AnyObject already ignored transitive imports, so
-  // ExtensionImportVisibility has no effect on these diagnostics.
+  // `MemberImportVisibility` has no effect on these diagnostics.
   a.fromC() // expected-error {{value of type 'AnyObject' has no member 'fromC'}}
   a.fromOverlayForCObjC() // expected-error {{value of type 'AnyObject' has no member 'fromOverlayForCObjC'}}
 }