Browse Source

Fixed lookup of namespaces in default imports.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3696 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
aaa165322a
  1. 4
      src/Main/Base/Test/NRefactoryResolverTests.cs
  2. 7
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs

4
src/Main/Base/Test/NRefactoryResolverTests.cs

@ -1018,6 +1018,8 @@ Class TestClass @@ -1018,6 +1018,8 @@ Class TestClass
End Sub
End Class
";
NamespaceResolveResult nrr = ResolveVB<NamespaceResolveResult>(program, "Collections", 4);
Assert.AreEqual("System.Collections", nrr.Name, "namespace should be resolved");
TypeResolveResult type = ResolveVB<TypeResolveResult>(program, "Collections.ArrayList", 4);
Assert.AreEqual("System.Collections.ArrayList", type.ResolvedClass.FullyQualifiedName, "TypeResolveResult");
LocalResolveResult local = ResolveVB<LocalResolveResult>(program, "a", 5);
@ -1028,7 +1030,7 @@ End Class @@ -1028,7 +1030,7 @@ End Class
[Test]
public void GlobalNamelookupVB()
{
// using an import this way IS possible in VB.NET
// test global name lookup (was broken once due to VB's implicit root namespace)
string program = "Imports System\n";
NamespaceResolveResult nrr = ResolveVB<NamespaceResolveResult>(program, "System", 1);
Assert.AreEqual("System", nrr.Name);

7
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs

@ -832,6 +832,13 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -832,6 +832,13 @@ namespace ICSharpCode.SharpDevelop.Dom
return result;
}
}
string nsResult = defaultImports.SearchNamespace(name);
if (nsResult != null) {
result = new SearchTypeResult(nsResult, null);
if (MatchesRequest(ref request, ref result)) {
return result;
}
}
}
return result;
}

Loading…
Cancel
Save