fixed XamlParser: now uses VB root-namespace rules in VB projects

icsharpcode · Oct 27, 2010 · 8267684 · 8267684
1 parent 0365a3f
commit 8267684
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs
@@ -5,10 +5,11 @@
 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 @@ public override void VisitElement(AXmlElement element)
 		}
 
 		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
@@ -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