Issue 15856 - Confusing error message with -transition=checkimports

src/dclass.d

@@ -1120,7 +1120,11 @@ public:
             return null;
         }
 
-        Dsymbol s = ScopeDsymbol.search(loc, ident, (flags & SearchImportsOnly) ? flags : flags | SearchLocalsOnly);
+        auto s = ScopeDsymbol.search(loc, ident, flags);
+
+        if ((flags & (SearchLocalsOnly | SearchImportsOnly)) != 0)
+            flags |= SearchLocalsOnly;
+
         if (!s)
         {
             // Search bases classes in depth-first, left to right order
@@ -1135,7 +1139,7 @@ public:
                     {
                         import ddmd.access : symbolIsVisible;
 
-                        s = b.sym.search(loc, ident, flags | SearchLocalsOnly);
+                        s = b.sym.search(loc, ident, flags);
                         if (!s)
                             continue;
                         else if (s == this) // happens if s is nested in this and derives from this

src/dmodule.d

@@ -1093,10 +1093,13 @@ public:
             //        toChars(), ident->toChars(), flags, insearch, searchCacheSymbol ? searchCacheSymbol->toChars() : "null");
             return searchCacheSymbol;
         }
+
         uint errors = global.errors;
+
         insearch = 1;
         Dsymbol s = ScopeDsymbol.search(loc, ident, flags);
         insearch = 0;
+
         if (errors == global.errors)
         {
             // Bugzilla 10752: We can cache the result only when it does not cause

src/dscope.d

@@ -523,7 +523,6 @@ struct Scope
                 return sold;
 
             // Search both ways
-            flags |= SearchCheck10378;
         }
 
         // First look in local scopes
@@ -554,17 +553,32 @@ struct Scope
         {
             alias snew = s;
             if (sold !is snew)
-            {
-                deprecation(loc, "local import search method found %s %s instead of %s %s",
-                    sold ? sold.kind() : "nothing", sold ? sold.toPrettyChars() : null,
-                    snew ? snew.kind() : "nothing", snew ? snew.toPrettyChars() : null);
-            }
+                deprecation10378(loc, sold, snew);
             if (global.params.bug10378)
                 s = sold;
         }
         return s;
     }
 
+    /* A helper function to show deprecation message for new name lookup rule.
+     */
+    extern (C++) static void deprecation10378(Loc loc, Dsymbol sold, Dsymbol snew)
+    {
+        OutBuffer buf;
+        buf.writestring("local import search method found ");
+        if (sold)
+            buf.printf("%s %s", sold.kind(), sold.toPrettyChars());
+        else
+            buf.writestring("nothing");
+        buf.writestring(" instead of ");
+        if (snew)
+            buf.printf("%s %s", snew.kind(), snew.toPrettyChars());
+        else
+            buf.writestring("nothing");
+
+        deprecation(loc, buf.peekString());
+    }
+
     extern (C++) Dsymbol search_correct(Identifier ident)
     {
         if (global.gag)

src/dsymbol.d

@@ -183,7 +183,6 @@ enum : int
                                     // meaning don't search imports in that scope,
                                     // because qualified module searches search
                                     // their imports
-    SearchCheck10378        = 0x40, // unqualified search with transition=checkimports switch
     IgnoreSymbolVisibility  = 0x80, // also find private and package protected symbols
 }
 
@@ -1276,9 +1275,6 @@ public:
         //printf("%s.ScopeDsymbol::search(ident='%s', flags=x%x)\n", toChars(), ident.toChars(), flags);
         //if (strcmp(ident->toChars(),"c") == 0) *(char*)0=0;
 
-        if (global.params.bug10378 && !(flags & SearchCheck10378))
-            flags &= ~(SearchImportsOnly | SearchLocalsOnly);
-
         // Look in symbols declared in this module
         if (symtab && !(flags & SearchImportsOnly))
         {
@@ -1311,15 +1307,7 @@ public:
                 if (ss.isModule())
                 {
                     if (flags & SearchLocalsOnly)
-                    {
-                        if (global.params.check10378 && !(flags & SearchCheck10378))
-                        {
-                            auto s3 = ss.search(loc, ident, sflags | IgnorePrivateImports);
-                            if (s3)
-                                deprecation("%s %s found in local import", s3.kind(), s3.toPrettyChars());
-                        }
                         continue;
-                    }
                 }
                 else
                 {

src/dsymbol.h

@@ -144,7 +144,6 @@ enum
                                     // meaning don't search imports in that scope,
                                     // because qualified module searches search
                                     // their imports
-    SearchCheck10378        = 0x40, // unqualified search with transition=checkimports switch
     IgnoreSymbolVisibility  = 0x80, // also find private and package protected symbols
 };
 

src/expression.d

@@ -679,9 +679,6 @@ extern (C++) Expression searchUFCS(Scope* sc, UnaExp ue, Identifier ident)
             s = sold;
             goto Lsearchdone;
         }
-
-        // Search both ways
-        flags |= SearchCheck10378;
     }
 
     // First look in local scopes
@@ -709,11 +706,7 @@ extern (C++) Expression searchUFCS(Scope* sc, UnaExp ue, Identifier ident)
     {
         alias snew = s;
         if (sold !is snew)
-        {
-            deprecation(loc, "local import search method found %s %s instead of %s %s",
-                sold ? sold.kind() : "nothing", sold ? sold.toPrettyChars() : null,
-                snew ? snew.kind() : "nothing", snew ? snew.toPrettyChars() : null);
-        }
+            Scope.deprecation10378(loc, sold, snew);
         if (global.params.bug10378)
             s = sold;
     }

src/mtype.d

@@ -7868,14 +7868,38 @@ public:
                 // goto L1;
             }
         }
-        s = sym.search(e.loc, ident);
+
+        Dsymbol searchSym()
+        {
+            int flags = 0;
+            Dsymbol sold = void;
+            if (global.params.bug10378 || global.params.check10378)
+            {
+                sold = sym.search(e.loc, ident, flags);
+                if (!global.params.check10378)
+                    return sold;
+            }
+
+            auto s = sym.search(e.loc, ident, flags | SearchLocalsOnly);
+            if (global.params.check10378)
+            {
+                alias snew = s;
+                if (sold !is snew)
+                    Scope.deprecation10378(e.loc, sold, snew);
+                if (global.params.bug10378)
+                    s = sold;
+            }
+            return s;
+        }
+
+        s = searchSym();
     L1:
         if (!s)
         {
             if (sym._scope) // it's a fwd ref, maybe we can resolve it
             {
                 sym.semantic(null);
-                s = sym.search(e.loc, ident);
+                s = searchSym();
             }
             if (!s)
                 return noMember(sc, e, ident, flag);
@@ -8639,7 +8663,31 @@ public:
             sc2.pop();
             return e;
         }
-        s = sym.search(e.loc, ident);
+
+        Dsymbol searchSym()
+        {
+            int flags = 0;
+            Dsymbol sold = void;
+            if (global.params.bug10378 || global.params.check10378)
+            {
+                sold = sym.search(e.loc, ident, flags);
+                if (!global.params.check10378)
+                    return sold;
+            }
+
+            auto s = sym.search(e.loc, ident, flags | SearchLocalsOnly);
+            if (global.params.check10378)
+            {
+                alias snew = s;
+                if (sold !is snew)
+                    Scope.deprecation10378(e.loc, sold, snew);
+                if (global.params.bug10378)
+                    s = sold;
+            }
+            return s;
+        }
+
+        s = searchSym();
     L1:
         if (!s)
         {

src/scope.h

@@ -146,6 +146,7 @@ struct Scope
     Module *instantiatingModule();
 
     Dsymbol *search(Loc loc, Identifier *ident, Dsymbol **pscopesym, int flags = IgnoreNone);
+    static void deprecation10378(Loc loc, Dsymbol *sold, Dsymbol *snew);
     Dsymbol *search_correct(Identifier *ident);
     Dsymbol *insert(Dsymbol *s);
 

test/compilable/imports/a15856.d

@@ -0,0 +1,3 @@
+module imports.a15856;
+
+alias int c_long;

test/compilable/test15856.d

@@ -0,0 +1,17 @@
+// REQUIRED_ARGS: -transition=checkimports -de
+// PERMUTE_ARGS:
+/*
+TEST_PUTPUT:
+---
+---
+*/
+
+class Foo
+{
+    import imports.a15856;
+
+    struct Bar
+    {
+        c_long a;
+    }
+}

test/fail_compilation/checkimports2a.d

@@ -2,15 +2,13 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/checkimports2a.d(23): Deprecation: class checkimports2a.B variable imports.imp2.Y found in local import
-fail_compilation/checkimports2a.d(27): Deprecation: local import search method found variable imports.imp1.Y instead of variable imports.imp2.Y
-fail_compilation/checkimports2a.d(23): Deprecation: class checkimports2a.B variable imports.imp2.X found in local import
-fail_compilation/checkimports2a.d(23): Deprecation: class checkimports2a.B variable imports.imp2.X found in local import
-fail_compilation/checkimports2a.d(32): Error: no property 'X' for type 'checkimports2a.B'
-fail_compilation/checkimports2a.d(23): Deprecation: class checkimports2a.B variable imports.imp2.Y found in local import
-fail_compilation/checkimports2a.d(33): Error: no property 'Y' for type 'checkimports2a.B'
-fail_compilation/checkimports2a.d(23): Deprecation: class checkimports2a.B variable imports.imp2.X found in local import
-fail_compilation/checkimports2a.d(23): Deprecation: class checkimports2a.B variable imports.imp2.Y found in local import
+fail_compilation/checkimports2a.d(24): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2a.X
+fail_compilation/checkimports2a.d(30): Deprecation: local import search method found variable imports.imp2.X instead of nothing
+fail_compilation/checkimports2a.d(30): Error: no property 'X' for type 'checkimports2a.B'
+fail_compilation/checkimports2a.d(31): Deprecation: local import search method found variable imports.imp2.Y instead of nothing
+fail_compilation/checkimports2a.d(31): Error: no property 'Y' for type 'checkimports2a.B'
+fail_compilation/checkimports2a.d(33): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2a.X
+fail_compilation/checkimports2a.d(34): Deprecation: local import search method found variable imports.imp2.Y instead of variable imports.imp1.Y
 ---
 */
 

test/fail_compilation/checkimports2b.d

@@ -2,9 +2,11 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/checkimports2b.d(20): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2b.X
-fail_compilation/checkimports2b.d(29): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2b.X
-fail_compilation/checkimports2b.d(30): Deprecation: local import search method found variable imports.imp2.Y instead of variable imports.imp1.Y
+fail_compilation/checkimports2b.d(22): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2b.X
+fail_compilation/checkimports2b.d(28): Deprecation: local import search method found variable imports.imp2.X instead of nothing
+fail_compilation/checkimports2b.d(29): Deprecation: local import search method found variable imports.imp2.Y instead of nothing
+fail_compilation/checkimports2b.d(31): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2b.X
+fail_compilation/checkimports2b.d(32): Deprecation: local import search method found variable imports.imp2.Y instead of variable imports.imp1.Y
 ---
 */
 

test/fail_compilation/checkimports2c.d

@@ -2,9 +2,11 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/checkimports2c.d(20): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2c.X
-fail_compilation/checkimports2c.d(29): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2c.X
-fail_compilation/checkimports2c.d(30): Deprecation: local import search method found variable imports.imp2.Y instead of variable imports.imp1.Y
+fail_compilation/checkimports2c.d(22): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2c.X
+fail_compilation/checkimports2c.d(28): Deprecation: local import search method found variable imports.imp2.X instead of nothing
+fail_compilation/checkimports2c.d(29): Deprecation: local import search method found variable imports.imp2.Y instead of nothing
+fail_compilation/checkimports2c.d(31): Deprecation: local import search method found variable imports.imp2.X instead of variable checkimports2c.X
+fail_compilation/checkimports2c.d(32): Deprecation: local import search method found variable imports.imp2.Y instead of variable imports.imp1.Y
 ---
 */