fix samples/EmbeddedImageAddIn and samples/HtmlSyntaxColorizer

siegfriedpammer · siegfriedpammer · commit 06bd0bf97e34 · 2014-01-15T22:16:37.000+01:00
diff --git a/samples/EmbeddedImageAddIn/EmbeddedImageAddIn.addin b/samples/EmbeddedImageAddIn/EmbeddedImageAddIn.addin
@@ -11,7 +11,7 @@
 	</Runtime>
 	
 	<Path name="/SharpDevelop/Workbench/LanguageBindings">
-		<Class id="EmbeddedImage" class="EmbeddedImageAddIn.EmbeddedImageLanguageBinding"/>
+		<Class id="EmbeddedImage" class="EmbeddedImageAddIn.EmbeddedImageTextEditorExtension"/>
 	</Path>
 	
 	<Path name="/SharpDevelop/Workbench/MainMenu/Edit/Insert">
diff --git a/samples/EmbeddedImageAddIn/EmbeddedImageAddIn.csproj b/samples/EmbeddedImageAddIn/EmbeddedImageAddIn.csproj
@@ -7,12 +7,13 @@
     <OutputType>Library</OutputType>
     <RootNamespace>EmbeddedImageAddIn</RootNamespace>
     <AssemblyName>EmbeddedImageAddIn</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\..\AddIns\Samples\EmbeddedImage\</OutputPath>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -44,6 +45,9 @@
       <HintPath>..\..\bin\ICSharpCode.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="ICSharpCode.NRefactory">
+      <HintPath>..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
+    </Reference>
     <Reference Include="ICSharpCode.SharpDevelop">
       <HintPath>..\..\bin\ICSharpCode.SharpDevelop.dll</HintPath>
       <Private>False</Private>
@@ -70,7 +74,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\AssemblyInfo.cs" />
-    <Compile Include="EmbeddedImageLanguageBinding.cs" />
+    <Compile Include="EmbeddedImageTextEditorExtension.cs" />
     <Compile Include="ImageCache.cs" />
     <Compile Include="ImageElement.cs" />
     <Compile Include="ImageElementGenerator.cs" />
diff --git a/samples/EmbeddedImageAddIn/EmbeddedImageAddIn.sln b/samples/EmbeddedImageAddIn/EmbeddedImageAddIn.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.7002
+# SharpDevelop 5.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedImageAddIn", "EmbeddedImageAddIn.csproj", "{1F60F9B0-E2FE-462F-9758-2E834D845438}"
 EndProject
 Global
@@ -10,9 +10,9 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F60F9B0-E2FE-462F-9758-2E834D845438}.Debug|x86.Build.0 = Debug|x86
 		{1F60F9B0-E2FE-462F-9758-2E834D845438}.Debug|x86.ActiveCfg = Debug|x86
-		{1F60F9B0-E2FE-462F-9758-2E834D845438}.Release|x86.Build.0 = Release|x86
+		{1F60F9B0-E2FE-462F-9758-2E834D845438}.Debug|x86.Build.0 = Debug|x86
 		{1F60F9B0-E2FE-462F-9758-2E834D845438}.Release|x86.ActiveCfg = Release|x86
+		{1F60F9B0-E2FE-462F-9758-2E834D845438}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 EndGlobal
diff --git a/samples/EmbeddedImageAddIn/EmbeddedImageTextEditorExtension.cs b/samples/EmbeddedImageAddIn/EmbeddedImageTextEditorExtension.cs
@@ -4,20 +4,18 @@
 using System;
 using System.IO;
 using ICSharpCode.AvalonEdit.Rendering;
-using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
 
 namespace EmbeddedImageAddIn
 {
 	// SharpDevelop creates one instance of EmbeddedImageLanguageBinding for each text editor.
-	public class EmbeddedImageLanguageBinding : DefaultLanguageBinding
+	public class EmbeddedImageTextEditorExtension : ITextEditorExtension
 	{
 		TextView textView;
 		ImageElementGenerator g;
 		
-		public override void Attach(ITextEditor editor)
+		public void Attach(ITextEditor editor)
 		{
-			base.Attach(editor);
 			// ITextEditor is SharpDevelop's abstraction of the text editor.
 			// We use GetService() to get the underlying AvalonEdit instance.
 			textView = editor.GetService(typeof(TextView)) as TextView;
@@ -27,12 +25,11 @@ public override void Attach(ITextEditor editor)
 			}
 		}
 		
-		public override void Detach()
+		public void Detach()
 		{
 			if (textView != null) {
 				textView.ElementGenerators.Remove(g);
 			}
-			base.Detach();
 		}
 	}
 }
diff --git a/samples/EmbeddedImageAddIn/InsertImageCommand.cs b/samples/EmbeddedImageAddIn/InsertImageCommand.cs
@@ -4,8 +4,8 @@
 using System;
 using System.IO;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Gui;
 using Microsoft.Win32;
 
 namespace EmbeddedImageAddIn
@@ -17,22 +17,22 @@ public class InsertImageCommand : AbstractMenuCommand
 	{
 		public override void Run()
 		{
-			if (WorkbenchSingleton.Workbench.ActiveViewContent == null)
+			if (SD.Workbench.ActiveViewContent == null)
 				return;
-			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent.GetService(typeof(ITextEditorProvider)) as ITextEditorProvider;
-			if (provider == null)
+			ITextEditor editor = SD.Workbench.ActiveViewContent.GetService(typeof(ITextEditor)) as ITextEditor;
+			if (editor == null)
 				return;
 			OpenFileDialog dlg = new OpenFileDialog();
 			dlg.Filter = "Image files|*.png;*.jpg;*.gif;*.bmp;*.jpeg|All files|*.*";
 			dlg.CheckFileExists = true;
 			dlg.DereferenceLinks = true;
-			string baseDirectory = Path.GetDirectoryName(provider.TextEditor.FileName);
+			string baseDirectory = Path.GetDirectoryName(editor.FileName);
 			dlg.InitialDirectory = baseDirectory;
 			if (dlg.ShowDialog() == true) {
 				string relativePath = FileUtility.GetRelativePath(baseDirectory, dlg.FileName);
 				if (!Path.IsPathRooted(relativePath))
 					relativePath = relativePath.Replace('\\', '/');
-				provider.TextEditor.Document.Insert(provider.TextEditor.Caret.Offset, "<<IMAGE:" + relativePath + ">>");
+				editor.Document.Insert(editor.Caret.Offset, "<<IMAGE:" + relativePath + ">>");
 			}
 		}
 	}
diff --git a/samples/HtmlSyntaxColorizer/HtmlSyntaxColorizer.csproj b/samples/HtmlSyntaxColorizer/HtmlSyntaxColorizer.csproj
@@ -7,7 +7,8 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>HtmlSyntaxColorizer</RootNamespace>
     <AssemblyName>HtmlSyntaxColorizer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -28,6 +29,9 @@
     <Reference Include="ICSharpCode.AvalonEdit">
       <HintPath>..\..\bin\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.NRefactory">
+      <HintPath>..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -47,4 +51,7 @@
     <Compile Include="HtmlWriter.cs" />
     <Compile Include="Main.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
 </Project>
diff --git a/samples/HtmlSyntaxColorizer/HtmlSyntaxColorizer.sln b/samples/HtmlSyntaxColorizer/HtmlSyntaxColorizer.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.6517
+# SharpDevelop 5.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlSyntaxColorizer", "HtmlSyntaxColorizer.csproj", "{6D17428C-A444-4C26-8FE3-976160F41D97}"
 EndProject
 Global
@@ -10,9 +10,9 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6D17428C-A444-4C26-8FE3-976160F41D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D17428C-A444-4C26-8FE3-976160F41D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D17428C-A444-4C26-8FE3-976160F41D97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D17428C-A444-4C26-8FE3-976160F41D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D17428C-A444-4C26-8FE3-976160F41D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D17428C-A444-4C26-8FE3-976160F41D97}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/samples/HtmlSyntaxColorizer/HtmlWriter.cs b/samples/HtmlSyntaxColorizer/HtmlWriter.cs
@@ -92,7 +92,7 @@ public string GenerateHtml(string code, IHighlightingDefinition highlightDefinit
 		
 		public string GenerateHtml(TextDocument document, IHighlightingDefinition highlightDefinition)
 		{
-			return GenerateHtml(document, new DocumentHighlighter(document, highlightDefinition.MainRuleSet));
+			return GenerateHtml(document, new DocumentHighlighter(document, highlightDefinition));
 		}
 		
 		public string GenerateHtml(TextDocument document, IHighlighter highlighter)
diff --git a/samples/HtmlSyntaxColorizer/app.config b/samples/HtmlSyntaxColorizer/app.config
@@ -0,0 +1,6 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+	</startup>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,18 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using ICSharpCode.AvalonEdit.Rendering;`
`7`		`-using ICSharpCode.SharpDevelop;`
`8`	`7`	`using ICSharpCode.SharpDevelop.Editor;`
`9`	`8`
`10`	`9`	`namespace EmbeddedImageAddIn`
`11`	`10`	`{`
`12`	`11`	`// SharpDevelop creates one instance of EmbeddedImageLanguageBinding for each text editor.`
`13`		`- public class EmbeddedImageLanguageBinding : DefaultLanguageBinding`
	`12`	`+ public class EmbeddedImageTextEditorExtension : ITextEditorExtension`
`14`	`13`	`{`
`15`	`14`	`TextView textView;`
`16`	`15`	`ImageElementGenerator g;`
`17`	`16`
`18`		`- public override void Attach(ITextEditor editor)`
	`17`	`+ public void Attach(ITextEditor editor)`
`19`	`18`	`{`
`20`		`- base.Attach(editor);`
`21`	`19`	`// ITextEditor is SharpDevelop's abstraction of the text editor.`
`22`	`20`	`// We use GetService() to get the underlying AvalonEdit instance.`
`23`	`21`	`textView = editor.GetService(typeof(TextView)) as TextView;`
`@@ -27,12 +25,11 @@ public override void Attach(ITextEditor editor)`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`
`30`		`- public override void Detach()`
	`28`	`+ public void Detach()`
`31`	`29`	`{`
`32`	`30`	`if (textView != null) {`
`33`	`31`	`textView.ElementGenerators.Remove(g);`
`34`	`32`	`}`
`35`		`- base.Detach();`
`36`	`33`	`}`
`37`	`34`	`}`
`38`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public string GenerateHtml(string code, IHighlightingDefinition highlightDefinit`
`92`	`92`
`93`	`93`	`public string GenerateHtml(TextDocument document, IHighlightingDefinition highlightDefinition)`
`94`	`94`	`{`
`95`		`- return GenerateHtml(document, new DocumentHighlighter(document, highlightDefinition.MainRuleSet));`
	`95`	`+ return GenerateHtml(document, new DocumentHighlighter(document, highlightDefinition));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public string GenerateHtml(TextDocument document, IHighlighter highlighter)`