From 17c9b20d6ae62af1cf25ccc33d4f82916cfd4f26 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Tue, 28 Sep 2010 03:03:55 +0200
Subject: [PATCH] Fix SdaUser sample

---
 samples/SdaUser/SdaUser.csproj                               | 4 ++--
 samples/XmlDOM/Window1.xaml                                  | 1 +
 samples/XmlDOM/XmlDOM.csproj                                 | 5 ++++-
 samples/XmlDOM/XmlDOM.sln                                    | 4 ++--
 .../RefactoringService/ContextActions/EditorContext.cs       | 2 ++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/samples/SdaUser/SdaUser.csproj b/samples/SdaUser/SdaUser.csproj
index 88a80b7528..7a8ff45f2c 100644
--- a/samples/SdaUser/SdaUser.csproj
+++ b/samples/SdaUser/SdaUser.csproj
@@ -80,11 +80,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\AddIns\AddIns\DisplayBindings\AvalonEdit\AvalonEdit.AddIn.addin">
+    <Content Include="..\..\AddIns\DisplayBindings\AvalonEdit\AvalonEdit.AddIn.addin">
       <Link>SdaAddIns\AvalonEdit.AddIn.addin</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\AddIns\AddIns\DisplayBindings\AvalonEdit\ICSharpCode.AvalonEdit.AddIn.dll">
+    <Content Include="..\..\AddIns\DisplayBindings\AvalonEdit\ICSharpCode.AvalonEdit.AddIn.dll">
       <Link>SdaAddIns\ICSharpCode.AvalonEdit.AddIn.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/samples/XmlDOM/Window1.xaml b/samples/XmlDOM/Window1.xaml
index ef7a6460de..e3e9c435de 100644
--- a/samples/XmlDOM/Window1.xaml
+++ b/samples/XmlDOM/Window1.xaml
@@ -4,6 +4,7 @@
 	xmlns:clr="clr-namespace:ICSharpCode.AvalonEdit.Xml;assembly=ICSharpCode.AvalonEdit"
 	xmlns:ic="http://icsharpcode.net/sharpdevelop/avalonedit"
 	Title="XmlEditor" Height="450" Width="600"
+	TextOptions.TextFormattingMode="Display"
 	>
 	<Window.Resources>
 		<Storyboard x:Key="anim">
diff --git a/samples/XmlDOM/XmlDOM.csproj b/samples/XmlDOM/XmlDOM.csproj
index 654755adb7..635a9bfc97 100644
--- a/samples/XmlDOM/XmlDOM.csproj
+++ b/samples/XmlDOM/XmlDOM.csproj
@@ -7,7 +7,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>XmlDOM</RootNamespace>
     <AssemblyName>XmlDOM</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
@@ -50,6 +50,9 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
diff --git a/samples/XmlDOM/XmlDOM.sln b/samples/XmlDOM/XmlDOM.sln
index 402ef647d5..399ffadfb7 100644
--- a/samples/XmlDOM/XmlDOM.sln
+++ b/samples/XmlDOM/XmlDOM.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 10
-# SharpDevelop 4.0.0.4664
+# Visual Studio 2010
+# SharpDevelop 4.0.0.6517
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlDOM", "XmlDOM.csproj", "{AF8CA20E-58AC-423E-95A8-5AA464938D19}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs
index f02188eb8c..32e37b15ba 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs
@@ -247,6 +247,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		{
 			//try {
 				var resolver = GetInitializedNRefactoryResolver(editor, this.CaretLine, this.CaretColumn);
+				if (resolver == null)
+					return null;
 				return resolver.ParseCurrentMember(editor.Document.Text);
 			//} catch {
 			//	return null;