Browse Source

fix bug in XamlUnresolvedFile: XamlDocumentVisitor did not create a reference to the base type of the XAML element. This led to an incomplete type definition if there's no code-behind partial class.

newNRILSpyDebugger
Siegfried Pammer 12 years ago
parent
commit
cc094dcba5
  1. 8
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs
  2. 10
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlUnresolvedFile.cs

8
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs

@ -7,13 +7,11 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.NRefactory; using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Editor; using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Utils; using ICSharpCode.NRefactory.Utils;
using ICSharpCode.NRefactory.Xml; using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop;
@ -21,7 +19,6 @@ using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.Search; using ICSharpCode.SharpDevelop.Editor.Search;
using ICSharpCode.SharpDevelop.Parser; using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring;
namespace ICSharpCode.XamlBinding namespace ICSharpCode.XamlBinding
{ {
@ -31,11 +28,6 @@ namespace ICSharpCode.XamlBinding
public class XamlParser : IParser public class XamlParser : IParser
{ {
public IReadOnlyList<string> TaskListTokens { get; set; } public IReadOnlyList<string> TaskListTokens { get; set; }
// public LanguageProperties Language
// {
// get { return LanguageProperties.CSharp; }
// }
public XamlParser() public XamlParser()
{ {

10
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlUnresolvedFile.cs

@ -3,22 +3,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.NRefactory; using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Editor; using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation; using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Xml; using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring;
namespace ICSharpCode.XamlBinding namespace ICSharpCode.XamlBinding
{ {
@ -162,6 +153,7 @@ namespace ICSharpCode.XamlBinding
Accessibility = Accessibility.Public, Accessibility = Accessibility.Public,
ReturnType = KnownTypeReference.Void ReturnType = KnownTypeReference.Void
}); });
TypeDefinition.BaseTypes.Add(CreateTypeReference(rootElement.Namespace, rootElement.LocalName));
} }
} }
base.VisitDocument(document); base.VisitDocument(document);

Loading…
Cancel
Save