pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix SdaUser sample

pull/1/head
Daniel Grunwald 16 years ago
parent
cef7bd1a6c
commit
17c9b20d6a
5 changed files with 11 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      samples/SdaUser/SdaUser.csproj
  2. 1
      samples/XmlDOM/Window1.xaml
  3. 5
      samples/XmlDOM/XmlDOM.csproj
  4. 4
      samples/XmlDOM/XmlDOM.sln
  5. 2
      src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs

4
samples/SdaUser/SdaUser.csproj
Unescape View File

@ -80,11 +80,11 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<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> <Link>SdaAddIns\AvalonEdit.AddIn.addin</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </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> <Link>SdaAddIns\ICSharpCode.AvalonEdit.AddIn.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>

1
samples/XmlDOM/Window1.xaml
Unescape View File

@ -4,6 +4,7 @@
xmlns:clr="clr-namespace:ICSharpCode.AvalonEdit.Xml;assembly=ICSharpCode.AvalonEdit" xmlns:clr="clr-namespace:ICSharpCode.AvalonEdit.Xml;assembly=ICSharpCode.AvalonEdit"
xmlns:ic="http://icsharpcode.net/sharpdevelop/avalonedit" xmlns:ic="http://icsharpcode.net/sharpdevelop/avalonedit"
Title="XmlEditor" Height="450" Width="600" Title="XmlEditor" Height="450" Width="600"
TextOptions.TextFormattingMode="Display"
> >
<Window.Resources> <Window.Resources>
<Storyboard x:Key="anim"> <Storyboard x:Key="anim">

5
samples/XmlDOM/XmlDOM.csproj
Unescape View File

@ -7,7 +7,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>XmlDOM</RootNamespace> <RootNamespace>XmlDOM</RootNamespace>
<AssemblyName>XmlDOM</AssemblyName> <AssemblyName>XmlDOM</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib> <NoStdLib>False</NoStdLib>
@ -50,6 +50,9 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="WindowsBase"> <Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework> <RequiredTargetFramework>3.0</RequiredTargetFramework>

4
samples/XmlDOM/XmlDOM.sln
Unescape View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 10 # Visual Studio 2010
# SharpDevelop 4.0.0.4664 # SharpDevelop 4.0.0.6517
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlDOM", "XmlDOM.csproj", "{AF8CA20E-58AC-423E-95A8-5AA464938D19}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlDOM", "XmlDOM.csproj", "{AF8CA20E-58AC-423E-95A8-5AA464938D19}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"

2
src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs
Unescape View File

@ -247,6 +247,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring
{ {
//try { //try {
var resolver = GetInitializedNRefactoryResolver(editor, this.CaretLine, this.CaretColumn); var resolver = GetInitializedNRefactoryResolver(editor, this.CaretLine, this.CaretColumn);
if (resolver == null)
return null;
return resolver.ParseCurrentMember(editor.Document.Text); return resolver.ParseCurrentMember(editor.Document.Text);
//} catch { //} catch {
// return null; // return null;

Write Preview
Loading…
Cancel
Save