Tests: Add more tests for ExtensionImportVisibility

test/NameLookup/Inputs/Categories/Categories_D.h

@@ -0,0 +1 @@
+// Intentionally empty

test/NameLookup/Inputs/Categories/Categories_E.swift

@@ -0,0 +1,2 @@
+import Categories_C
+import Categories_D.Submodule

test/NameLookup/Inputs/Categories/Submodule.h

@@ -0,0 +1,5 @@
+@import Categories_A;
+
+@interface X (SubmoduleOfD)
+- (void)fromSubmoduleOfD;
+@end

test/NameLookup/Inputs/Categories/module.modulemap

@@ -12,3 +12,14 @@ module Categories_C {
   header "Categories_C.h"
   export *
 }
+
+module Categories_D {
+  header "Categories_D.h"
+  export *
+
+  explicit module Submodule {
+    header "Submodule.h"
+    export *
+  }
+}
+

test/NameLookup/Inputs/extensions_A.swift

@@ -8,10 +8,18 @@ extension Y: P where T: P { }
 
 public struct Z: P { }
 
+infix operator <<<
+infix operator >>>
+infix operator <>
+
 extension X {
   public func XinA() { }
+
+  public static func <<<(a: Self, b: Self) -> Self { a }
 }
 
 extension Y {
   public func YinA() { }
+
+  public static func <<<(a: Self, b: Self) -> Self { a }
 }

test/NameLookup/Inputs/extensions_B.swift

@@ -1,10 +1,15 @@
 import extensions_A
 
+
 extension X {
   public func XinB() { }
+
+  public static func >>>(a: Self, b: Self) -> Self { b }
 }
 
 extension Y {
   public func YinB() { }
+
+  public static func >>>(a: Self, b: Self) -> Self { b }
 }
 

test/NameLookup/Inputs/extensions_C.swift

@@ -1,11 +1,15 @@
 @_exported import extensions_A
 import extensions_B
 
+
 extension X {
   public func XinC() { }
+
+  public static func <>(a: Self, b: Self) -> Self { a }
 }
 
 extension Y {
   public func YinC() { }
-}
 
+  public static func <>(a: Self, b: Self) -> Self { a }
+}

test/NameLookup/extensions_transitive.swift

@@ -7,12 +7,21 @@
 import extensions_C
 // expected-note 2{{add import of module 'extensions_B'}}{{1-1=import extensions_B\n}}
 func test(x: X, y: Y<Z>) {
+  // Declared in extensions_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'}}
+  _ = x >>> x // expected-error{{cannot find operator '>>>' in scope}}
+  _ = y >>> y // expected-error{{cannot find operator '>>>' in scope}}
 
+  // Declared in extensions_C
   x.XinC()
   y.YinC()
+  _ = x <> x
+  _ = y <> y
 }

test/NameLookup/extensions_transitive_objc.swift

@@ -2,21 +2,24 @@
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_A.swift
 // 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_D.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
 
 // REQUIRES: objc_interop
 
 import Categories_B
-import Categories_D
-// expected-note 2 {{add import of module 'Categories_C'}}{{1-1=import Categories_C\n}}
+import Categories_E
+
+// expected-note@-1 2 {{add import of module 'Categories_C'}}{{1-1=import Categories_C\n}}
+// expected-note@-2 {{add import of module 'Categories_D'}}{{1-1=import Categories_D\n}}
 func test(x: X) {
   x.fromA()
   x.fromOverlayForA()
   x.fromB()
   x.fromOverlayForB()
   x.fromC() // expected-error {{class method 'fromC()' is not available due to missing import of defining module 'Categories_C'}}
   x.fromOverlayForC() // expected-error {{instance method 'fromOverlayForC()' is not available due to missing import of defining module 'Categories_C'}}
+  x.fromSubmoduleOfD() // expected-error {{class method 'fromSubmoduleOfD()' is not available due to missing import of defining module 'Categories_D'}}
 }
 
 func testAnyObject(a: AnyObject) {