Merge pull request #425 from dsyme/fix-177

Fix 177

Author: dsyme

src/fsharp/NameResolution.fs

@@ -1884,11 +1884,14 @@ let rec ResolveLongIdentInTypePrim (ncenv:NameResolver) nenv lookupKind (resInfo
                     | ResolveTypeNamesToTypeRefs -> 
                         OneSuccess (resInfo,Item.Types (nm,nestedTypes),rest)
             else 
-                ResolveLongIdentInTypes ncenv nenv lookupKind resInfo (depth+1) m ad rest findFlag typeNameResInfo nestedTypes
+                ResolveLongIdentInNestedTypes ncenv nenv lookupKind resInfo (depth+1) id m ad rest findFlag typeNameResInfo nestedTypes
         (OneResult contentsSearchAccessible +++ nestedSearchAccessible)
 
-and ResolveLongIdentInTypes (ncenv:NameResolver) nenv lookupKind resInfo depth m ad lid findFlag typeNameResInfo typs = 
-    typs |> CollectResults (ResolveLongIdentInTypePrim ncenv nenv lookupKind resInfo depth m ad lid findFlag typeNameResInfo >> AtMostOneResult m) 
+and ResolveLongIdentInNestedTypes (ncenv:NameResolver) nenv lookupKind resInfo depth id m ad lid findFlag typeNameResInfo typs = 
+    typs |> CollectResults (fun typ -> 
+        let resInfo = if isAppTy ncenv.g typ then resInfo.AddEntity(id.idRange,tcrefOfAppTy ncenv.g typ) else resInfo
+        ResolveLongIdentInTypePrim ncenv nenv lookupKind resInfo depth m ad lid findFlag typeNameResInfo typ 
+        |> AtMostOneResult m) 
 
 /// Resolve a long identifer using type-qualified name resolution.
 let ResolveLongIdentInType sink ncenv nenv lookupKind m ad lid findFlag typeNameResInfo typ =

tests/service/CSharpProjectAnalysis.fs

@@ -93,7 +93,7 @@ let ``Test that csharp references are recognized as such`` () =
     | None -> 
         Assert.Fail ("CSharpClass was not found in CSharp_Analysis assembly!")
 
-[<Test; Ignore("Failing test for https://github.com/fsharp/FSharp.Compiler.Service/issues/177")>]
+[<Test>]
 let ``Test that symbols of csharp inner classes/enums are reported`` () = 
     let csharpAssembly = typeof<CSharpClass>.Assembly.Location
     let content = """
@@ -109,6 +109,5 @@ let _ = CSharpOuterClass.InnerClass.StaticMember()
     |> Async.RunSynchronously
     |> Array.map (fun su -> su.Symbol.ToString())
     |> shouldEqual 
-        [|"CSharpOuterClass"; "InnerEnum"; "symbol Case1"; 
-          "CSharpOuterClass"; "InnerClass"; "val StaticMember"; 
-          "NestedEnumClass"|]
+          [|"InnerEnum"; "CSharpOuterClass"; "symbol Case1"; "InnerClass";
+            "CSharpOuterClass"; "member StaticMember"; "NestedEnumClass"|]

tests/service/EditorTests.fs

@@ -35,7 +35,7 @@ let ``Intro test`` () =
     let inputLines = input.Split('\n')
     let file = "/home/user/Test.fsx"
     let untyped, typeCheckResults =  parseAndTypeCheckFileInProject(file, input) 
-    let identToken = Parser.tagOfToken(Parser.token.IDENT("")) 
+    let identToken = FSharpTokenTag.IDENT
 
     // We only expect one reported error. However,
     // on Unix, using filenames like /home/user/Test.fsx gives a second copy of all parse errors due to the
@@ -216,7 +216,7 @@ let ``Expression typing test`` () =
     let inputLines = input3.Split('\n')
     let file = "/home/user/Test.fsx"
     let untyped, typeCheckResults =  parseAndTypeCheckFileInProject(file, input3) 
-    let identToken = Parser.tagOfToken(Parser.token.IDENT("")) 
+    let identToken = FSharpTokenTag.IDENT
 
     // We only expect one reported error. However,
     // on Unix, using filenames like /home/user/Test.fsx gives a second copy of all parse errors due to the
@@ -239,6 +239,10 @@ let ``Expression typing test`` () =
                "StartsWith"; "Substring"; "ToCharArray"; "ToLower"; "ToLowerInvariant";
                "ToString"; "ToUpper"; "ToUpperInvariant"; "Trim"; "TrimEnd"; "TrimStart"])
 
+// The underlying problem is that the parser error recovery doesn't include _any_ information for
+// the incomplete member:
+//    member x.Test = 
+
 [<Test; Ignore("Currently failing, see #139")>]
 let ``Find function from member 1`` () = 
     let input = 

tests/service/FsiTests.fs

@@ -142,7 +142,7 @@ let ``ParseAndCheckInteraction test 1``() =
 
     // Check we can't get a declaration location for text in the F# interactive state (because the file doesn't exist)
     // TODO: check that if we use # line directives, then the file will exist correctly
-    let identToken = Parser.tagOfToken(Parser.token.IDENT("")) 
+    let identToken = FSharpTokenTag.IDENT
     typedResults.GetDeclarationLocationAlternate(1,6,"xxxxxx",["xxxxxx"]) |> Async.RunSynchronously |> shouldEqual (FSharpFindDeclResult.DeclNotFound  FSharpFindDeclFailureReason.NoSourceCode) 
 
     // Check we can get a tooltip for text in the F# interactive state