From bef6600d566bec7c55c79df4c136ca4e92ed760d Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Tue, 10 Aug 2010 18:26:40 +0000 Subject: [PATCH] A form with a base class which is not System.Windows.Forms.Form can now be designed in the IronPython forms designer. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6401 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../PythonBinding/Project/Src/PythonAstWalker.cs | 1 + .../Parsing/ParseTestClassWithBaseClassTestFixture.cs | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs index f3dbe7d692..e9999a1661 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs @@ -46,6 +46,7 @@ namespace ICSharpCode.PythonBinding { DefaultUsingScope usingScope = new DefaultUsingScope(); usingScope.NamespaceName = Path.GetFileNameWithoutExtension(fileName); + usingScope.Parent = new DefaultUsingScope(); compilationUnit.UsingScope = usingScope; } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseTestClassWithBaseClassTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseTestClassWithBaseClassTestFixture.cs index 2fe65b4a3b..f28f91fee5 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseTestClassWithBaseClassTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseTestClassWithBaseClassTestFixture.cs @@ -71,8 +71,9 @@ namespace PythonBinding.Tests.Parsing [Test] public void CompilationUnitUsingScopeNamespaceNameIsNamespaceTakenFromFileName() { + string namespaceName = compilationUnit.UsingScope.NamespaceName; string expectedNamespace = "test"; - Assert.AreEqual(expectedNamespace, compilationUnit.UsingScope.NamespaceName); + Assert.AreEqual(expectedNamespace, namespaceName); } [Test] @@ -85,5 +86,13 @@ namespace PythonBinding.Tests.Parsing string expectedBaseTypeName = "unittest.TestCase"; Assert.AreEqual(expectedBaseTypeName, actualBaseTypeName); } + + [Test] + public void CompilationUnitUsingScopeHasParentUsingScopeWithNamespaceNameOfEmptyString() + { + IUsingScope parentUsingScope = compilationUnit.UsingScope.Parent; + string namespaceName = parentUsingScope.NamespaceName; + Assert.AreEqual(String.Empty, namespaceName); + } } }