From 8267684c53d6db9509a5c984dcc9157235f8231b Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 27 Oct 2010 22:15:04 +0200 Subject: [PATCH] fixed XamlParser: now uses VB root-namespace rules in VB projects --- .../XamlBinding/CompilationUnitCreatorVisitor.cs | 6 +++++- .../BackendBindings/XamlBinding/XamlBinding/XamlParser.cs | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs index a7a4f3529a..7c8c714634 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs @@ -5,10 +5,11 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Text; using ICSharpCode.AvalonEdit.Xml; using ICSharpCode.SharpDevelop.Dom; -using System.Text; +using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.XamlBinding { @@ -134,6 +135,9 @@ namespace ICSharpCode.XamlBinding } IClass AddClass(string className, AXmlElement element) { + if (projectContent.Language == LanguageProperties.VBNet && projectContent.Project is IProject) + className = ((IProject)projectContent.Project).RootNamespace + "." + className; + DefaultClass c = new DefaultClass(CompilationUnit, className); string modifierValue = (element.GetAttributeValue(CompletionDataHelper.XamlNamespace, "ClassModifier") ?? string.Empty).Trim(); diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs index 9b00d3f27c..c03df01f4b 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs @@ -2,16 +2,14 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Xml; + using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Xml; using ICSharpCode.Core; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.XamlBinding