Suggestions for mispelled values - fixes dotnet#1909

forki · Dec 2, 2016 · dd1b41d · dd1b41d
1 parent 88a4cff
commit dd1b41d
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs
@@ -2115,10 +2115,11 @@ let rec ResolveExprLongIdentPrim sink (ncenv:NameResolver) fullyQualified m ad n
                   Some (FreshenUnqualifiedItem ncenv m res, [])
               | None -> 
                   None
+
           match envSearch with 
           | Some res -> res
           | None ->
-              let search =
+              let innerSearch =
                   // Check if it's a type name, e.g. a constructor call or a type instantiation
                   let ctorSearch = 
                       let tcrefs = LookupTypeNameInEnvMaybeHaveArity fullyQualified id.idText typeNameResInfo nenv
@@ -2131,12 +2132,24 @@ let rec ResolveExprLongIdentPrim sink (ncenv:NameResolver) fullyQualified m ad n
                   let implicitOpSearch = 
                       if IsMangledOpName id.idText then 
                           success [(resInfo,Item.ImplicitOp(id, ref None),[])] 
-                      else NoResultsOrUsefulErrors
+                      else 
+                          NoResultsOrUsefulErrors
+
+
+                  ctorSearch +++ implicitOpSearch
+
+              let resInfo,item,rest = 
+                  match AtMostOneResult m innerSearch with
+                  | Result _ as res -> ForceRaise res
+                  | _ -> 
+                      let predictedNames =
+                          nenv.eUnqualifiedItems
+                          |> Seq.map (fun e -> e.Value.DisplayName)
+                          |> Set.ofSeq
 
-                  let failingCase = raze (UndefinedName(0,FSComp.SR.undefinedNameValueOfConstructor,id,NoPredictions))
-                  ctorSearch +++ implicitOpSearch +++ failingCase
+                      let failingCase = raze (UndefinedName(0,FSComp.SR.undefinedNameValueOfConstructor,id,predictedNames))
+                      ForceRaise failingCase
 
-              let resInfo,item,rest = ForceRaise (AtMostOneResult m search) 
               ResolutionInfo.SendToSink(sink,ncenv,nenv,ItemOccurence.Use,ad,resInfo,ResultTyparChecker(fun () -> CheckAllTyparsInferrable ncenv.amap m item))
               item,rest