Shortcut NameResolution searches

dotnet · Mar 6, 2018 · c1868a0 · c1868a0
1 parent 0adb823
commit c1868a0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs
@@ -2705,10 +2705,17 @@ let rec ResolvePatternLongIdentPrim sink (ncenv:NameResolver) fullyQualified war
             | _ -> 
                 NoResultsOrUsefulErrors
         let resInfo,res,rest = 
-            match AtMostOneResult m (tyconSearch ad +++ moduleSearch ad) with 
+            match AtMostOneResult m (tyconSearch ad) with
             | Result _ as res -> ForceRaise res
-            | _ ->  
-                ForceRaise (AtMostOneResult m (tyconSearch AccessibleFromSomeFSharpCode +++ moduleSearch AccessibleFromSomeFSharpCode))
+            | _ ->
+                match AtMostOneResult m (moduleSearch ad) with
+                | Result _ as res -> ForceRaise res
+                | _ ->
+                    match AtMostOneResult m (tyconSearch AccessibleFromSomeFSharpCode ) with
+                    | Result _ as res -> ForceRaise res
+                    | _ ->
+                        ForceRaise (AtMostOneResult m (moduleSearch AccessibleFromSomeFSharpCode))
+
         ResolutionInfo.SendEntityPathToSink(sink,ncenv,nenv,ItemOccurence.Use,ad,resInfo,ResultTyparChecker(fun () -> true))
 
         if not (isNil rest) then error(Error(FSComp.SR.nrIsNotConstructorOrLiteral(),(List.head rest).idRange))