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

Merge branch '4.1'

pull/20/merge
Daniel Grunwald 14 years ago
parent
6bf4b3763b 736b5b66ae
commit
3770df6ae1
19 changed files with 191 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      data/resources/StringResources.fr.resx
  2. 9
      data/resources/StringResources.nl.resx
  3. 3
      data/resources/StringResources.resx
  4. 18
      data/templates/project/VB/SilverlightApplication.xpt
  5. 7
      samples/AvalonEdit.Sample/AvalonEdit.Sample.csproj
  6. 16
      samples/AvalonEdit.Sample/AvalonEdit.Sample.sln
  7. 3
      samples/AvalonEdit.Sample/Window1.xaml
  8. 2
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeManipulation.cs
  9. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll
  10. 162
      src/Libraries/AvalonEdit/Documentation/ICSharpCode.AvalonEdit.shfbproj
  11. 13
      src/Libraries/AvalonEdit/Documentation/Text Rendering.aml
  12. 1
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/InsightWindow.cs
  13. 1
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/ISegment.cs
  14. 1
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LinkElementGenerator.cs
  15. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/NewLineElementGenerator.cs
  16. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs
  17. 18
      src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsHelper.cs
  18. 17
      src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
  19. 4
      src/Tools/UpdateAssemblyInfo/Main.cs

22
data/resources/StringResources.fr.resx
Unescape View File

@ -2700,6 +2700,9 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value> @@ -2700,6 +2700,9 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
<data name="Dialog.Options.IDEOptions.TextEditor.General.AntialiasedFontCheckBox" xml:space="preserve">
<value>Lissage des polices</value>
</data>
<data name="Dialog.Options.IDEOptions.TextEditor.General.ChangeMarkerMarginCheckBox" xml:space="preserve">
<value>Activer la marge pour le marqueur de suivi des modification</value>
</data>
<data name="Dialog.Options.IDEOptions.TextEditor.General.CodeCompletionCheckBox" xml:space="preserve">
<value>Activer la &amp;complétion de code</value>
</data>
@ -4392,7 +4395,7 @@ Toutes les modifications seront perdues.</value> @@ -4392,7 +4395,7 @@ Toutes les modifications seront perdues.</value>
<value>Catégories</value>
</data>
<data name="ICSharpCode.SharpDevelop.FormDesigner.Gui.ConfigureSidebarDialog.DialogName" xml:space="preserve">
<value>Configurer l'encadré (sidebar)</value>
<value>Configuration des outils</value>
</data>
<data name="ICSharpCode.SharpDevelop.FormDesigner.Gui.ConfigureSidebarDialog.Namespace" xml:space="preserve">
<value>Espace de noms</value>
@ -5528,6 +5531,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace @@ -5528,6 +5531,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
<data name="MainWindow.Windows.Debug.CallStack.CannotSwitchWithoutSymbols" xml:space="preserve">
<value>Vous ne pouvez pas changer pour une fonction sans symboles.</value>
</data>
<data name="MainWindow.Windows.Debug.CallStack.CannotSwitchWithoutSymbolsOrDecompiledCodeOptions" xml:space="preserve">
<value>Les options de décompilation du code doivent être activés pour aller vers une fonction sans symboles.</value>
</data>
<data name="MainWindow.Windows.Debug.CallStack.ExternalMethods" xml:space="preserve">
<value>[Méthodes externes]</value>
</data>
@ -5790,9 +5796,15 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace @@ -5790,9 +5796,15 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
<data name="MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction" xml:space="preserve">
<value>Vous ne pouvez pas faire de pas-à-pas car il n'y a pas de fonction active sélectionnée</value>
</data>
<data name="MainWindow.Windows.Debug.Threads.CannotSwitchOnNAFrame" xml:space="preserve">
<value>Impossible de chager de thread sans cadre disponible.</value>
</data>
<data name="MainWindow.Windows.Debug.Threads.CannotSwitchWhileRunning" xml:space="preserve">
<value>Vous ne pouvez pas changer de fonction lorsque le débogueur est lancé.</value>
</data>
<data name="MainWindow.Windows.Debug.Threads.CannotSwitchWithoutDecompiledCodeOptions" xml:space="preserve">
<value>Les options de décompilation du code doivent être activés pour changer de thread.</value>
</data>
<data name="MainWindow.Windows.Debug.Threads.Freeze" xml:space="preserve">
<value>Pause</value>
</data>
@ -7123,6 +7135,9 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value @@ -7123,6 +7135,9 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value
<data name="Templates.File.EmptyFile.Name" xml:space="preserve">
<value>Fichier vide</value>
</data>
<data name="Templates.File.Exception.Description" xml:space="preserve">
<value>Créée une nouvelle classe pour les Exceptions.</value>
</data>
<data name="Templates.File.Exception.Name" xml:space="preserve">
<value>Exception</value>
</data>
@ -7255,6 +7270,9 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value @@ -7255,6 +7270,9 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value
<data name="Templates.File.WebForm.Name" xml:space="preserve">
<value>Formulaire Web ASP.NET</value>
</data>
<data name="Templates.File.WebHandler.Description" xml:space="preserve">
<value>Créée un gestionnaire web ASP.NET avec code attaché.</value>
</data>
<data name="Templates.File.WebHandler.Name" xml:space="preserve">
<value>Gestionnaire ASP.NET</value>
</data>
@ -7484,7 +7502,7 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value @@ -7484,7 +7502,7 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value
<value>Créer un nouveau rapport avec le Report Wizard</value>
</data>
<data name="XML.FormsDesigner.SideBar.CustomizeSidebar" xml:space="preserve">
<value>Configurer l'encadré (sidebar)...</value>
<value>Configuration des outils</value>
</data>
<data name="XML.MainMenu.Analysis" xml:space="preserve">
<value>&amp;Analyses</value>

9
data/resources/StringResources.nl.resx
Unescape View File

@ -1477,6 +1477,9 @@ Om een ActiveX/COM object te maken/manipuleren, sleep een klasse uit een type-bi @@ -1477,6 +1477,9 @@ Om een ActiveX/COM object te maken/manipuleren, sleep een klasse uit een type-bi
<data name="ComponentInspector.WaitingForAppDialog.Title" xml:space="preserve">
<value>Wacht op starten van de toepassing</value>
</data>
<data name="CQA.MainWindow.FormTitle" xml:space="preserve">
<value>Code kwaliteit analyse</value>
</data>
<data name="CSharpBinding.GenerateNewHandlerInstructions" xml:space="preserve">
<value>Voeg referentie naar expliciete methode in, druk opnieuw de TAB of Enter om een nieuwe methode stub in te voegen.</value>
</data>
@ -7136,6 +7139,9 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze.</value> @@ -7136,6 +7139,9 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze.</value>
<data name="Templates.File.EmptyFile.Name" xml:space="preserve">
<value>Leeg bestand</value>
</data>
<data name="Templates.File.Exception.Description" xml:space="preserve">
<value>Maakt een nieuwe uitzonderings klasse aan.</value>
</data>
<data name="Templates.File.Exception.Name" xml:space="preserve">
<value>Uitzondering</value>
</data>
@ -7268,6 +7274,9 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze.</value> @@ -7268,6 +7274,9 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze.</value>
<data name="Templates.File.WebForm.Name" xml:space="preserve">
<value>ASP.NET Web Formulier</value>
</data>
<data name="Templates.File.WebHandler.Description" xml:space="preserve">
<value>Maakt een ASP.NET Webhandler aan met achterliggende code.</value>
</data>
<data name="Templates.File.WebHandler.Name" xml:space="preserve">
<value>ASP.NET behandelaar</value>
</data>

3
data/resources/StringResources.resx
Unescape View File

@ -1519,6 +1519,9 @@ To create/manipulate a ActiveX/COM object, drag a class within a TypeLib/Control @@ -1519,6 +1519,9 @@ To create/manipulate a ActiveX/COM object, drag a class within a TypeLib/Control
<data name="ComponentInspector.WaitingForAppDialog.Title" xml:space="preserve">
<value>Waiting for Application to Start</value>
</data>
<data name="CQA.MainWindow.FormTitle" xml:space="preserve">
<value>Code Quality Analysis</value>
</data>
<data name="CSharpBinding.GenerateNewHandlerInstructions" xml:space="preserve">
<value>Insert reference to explicit method; press tab or enter again to insert a new method stub.</value>
</data>

18
data/templates/project/VB/SilverlightApplication.xpt
Unescape View File

@ -25,6 +25,12 @@ @@ -25,6 +25,12 @@
<Reference Include="System.Net" />
<Reference Include="System.Xml" />
<Reference Include="System.Windows.Browser" />
<Import Include="Microsoft.VisualBasic" />
<Import Include="System" />
<Import Include="System.Collections" />
<Import Include="System.Collections.Generic" />
<Import Include="System.Diagnostics" />
</ProjectItems>
<PropertyGroup escapeValue="False">
@ -55,15 +61,15 @@ @@ -55,15 +61,15 @@
</PropertyGroup>
<PropertyGroup configuration="Debug" escapeValue="false">
<DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
<DefineConstants>DEBUG,TRACE,SILVERLIGHT</DefineConstants>
</PropertyGroup>
<PropertyGroup configuration="Release" escapeValue="false">
<DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
<DefineConstants>TRACE,SILVERLIGHT</DefineConstants>
</PropertyGroup>
<Imports clear="True">
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v4.0\Microsoft.Silverlight.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v4.0\Microsoft.Silverlight.VisualBasic.targets" />
</Imports>
<Files>
@ -111,16 +117,14 @@ Public Partial Class App @@ -111,16 +117,14 @@ Public Partial Class App
Private Sub Application_UnhandledException(sender As Object, e As ApplicationUnhandledExceptionEventArgs)
If Not System.Diagnostics.Debugger.IsAttached Then
e.Handled = True
Deployment.Current.Dispatcher.BeginInvoke(Function() Do
ReportErrorToDOM(e)
End Function)
Deployment.Current.Dispatcher.BeginInvoke(Sub() ReportErrorToDOM(e))
End If
End Sub
Private Sub ReportErrorToDOM(e As ApplicationUnhandledExceptionEventArgs)
Try
Dim errorMsg As String = e.ExceptionObject.Message + e.ExceptionObject.StackTrace
errorMsg = errorMsg.Replace(""""C, "'"C).Replace(vbCr & vbLf, "\n")
errorMsg = errorMsg.Replace(""""C, "'"C).Replace(vbCrLf, "\n")
System.Windows.Browser.HtmlPage.Window.Eval("throw new Error(""Unhandled Error in Silverlight Application " & errorMsg & """);")
Catch generatedExceptionName As Exception

7
samples/AvalonEdit.Sample/AvalonEdit.Sample.csproj
Unescape View File

@ -13,6 +13,9 @@ @@ -13,6 +13,9 @@
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>True</DebugSymbols>
@ -94,10 +97,6 @@ @@ -94,10 +97,6 @@
<Resource Include="Images\Undo.png" />
<Resource Include="Images\WordWrap.png" />
</ItemGroup>
<ItemGroup>
<Folder Include="Images" />
<Folder Include="Images" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="CustomHighlighting.xshd" />
</ItemGroup>

16
samples/AvalonEdit.Sample/AvalonEdit.Sample.sln
Unescape View File

@ -1,20 +1,26 @@ @@ -1,20 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.0.0.6543
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.Sample", "AvalonEdit.Sample.csproj", "{13A5B497-BA12-45AE-9033-22620C3153FB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|x86 = Release|x86
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{13A5B497-BA12-45AE-9033-22620C3153FB}.Debug|x86.Build.0 = Debug|x86
{13A5B497-BA12-45AE-9033-22620C3153FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13A5B497-BA12-45AE-9033-22620C3153FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13A5B497-BA12-45AE-9033-22620C3153FB}.Debug|x86.ActiveCfg = Debug|x86
{13A5B497-BA12-45AE-9033-22620C3153FB}.Release|x86.Build.0 = Release|x86
{13A5B497-BA12-45AE-9033-22620C3153FB}.Debug|x86.Build.0 = Debug|x86
{13A5B497-BA12-45AE-9033-22620C3153FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13A5B497-BA12-45AE-9033-22620C3153FB}.Release|Any CPU.Build.0 = Release|Any CPU
{13A5B497-BA12-45AE-9033-22620C3153FB}.Release|x86.ActiveCfg = Release|x86
{13A5B497-BA12-45AE-9033-22620C3153FB}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

3
samples/AvalonEdit.Sample/Window1.xaml
Unescape View File

@ -21,7 +21,8 @@ @@ -21,7 +21,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
TextOptions.TextFormattingMode="Display"
Title="AvalonEdit.Sample" Height="500" Width="700"
>
<DockPanel>

2
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeManipulation.cs
Unescape View File

@ -333,6 +333,8 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -333,6 +333,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
static void SelectText(Selection selection, ITextEditor editor)
{
if (selection == null)
return;
int startOffset, endOffset;
try {
startOffset = editor.Document.PositionToOffset(selection.Start);

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll
View File

Binary file not shown.

162
src/Libraries/AvalonEdit/Documentation/ICSharpCode.AvalonEdit.shfbproj
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<!-- The configuration and platform will be used to determine which
assemblies to include from solution and project documentation
@ -7,7 +8,7 @@ @@ -7,7 +8,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{850b6602-0a7f-413a-864a-e816b98d7407}</ProjectGuid>
<SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
<SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
@ -30,63 +31,28 @@ @@ -30,63 +31,28 @@
</WorkingPath>
<BuildLogFile>
</BuildLogFile>
<FrameworkVersion>3.5</FrameworkVersion>
<FrameworkVersion>.NET 4.0.30319</FrameworkVersion>
<HelpTitle>AvalonEdit</HelpTitle>
<CopyrightText>Copyright 2008-2010, Daniel Grunwald</CopyrightText>
<CopyrightText>Copyright 2008-2011, Daniel Grunwald</CopyrightText>
<PresentationStyle>Prototype</PresentationStyle>
<HelpFileVersion>4.0.0.0</HelpFileVersion>
<HelpFileVersion>4.1.0.0</HelpFileVersion>
<ComponentConfigurations>
<ComponentConfig id="Cached Reflection Index Data" enabled="True">
<component id="Cached Reflection Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<index name="reflection" value="/reflection/apis/api" key="@id" cache="10">
<cache base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" cacheFile="{@AppDataFolder}Cache\Reflection.cache" />
<data files="reflection.xml" />
</index>
<copy name="reflection" source="*" target="/document/reference" />
</component>
</ComponentConfig>
<ComponentConfig id="Cached MSDN URL References" enabled="True">
<component id="Cached MSDN URL References" type="SandcastleBuilder.Components.CachedResolveReferenceLinksComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<cache filename="{@AppDataFolder}Cache\MsdnUrl.cache" />
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@SDKLinks}" />
<targets files="reflection.xml" type="{@ProjectLinks}" />
</component>
</ComponentConfig>
<ComponentConfig id="IntelliSense Component" enabled="True">
<component id="IntelliSense Component" type="SandcastleBuilder.Components.IntelliSenseComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<!-- Output options (optional)
Attributes:
Include Namespaces (false by default)
Namespaces filename ("Namespaces" if not specified or empty)
Directory (current folder if not specified or empty) -->
<output includeNamespaces="false" namespacesFile="Namespaces" folder="{@OutputFolder}" />
</component>
</ComponentConfig>
<ComponentConfig id="Cached Framework Comments Index Data" enabled="True">
<component id="Cached Framework Comments Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<index name="comments" value="/doc/members/member" key="@name" cache="100">
{@CachedFrameworkCommentList}
{@CommentFileList}
</index>
<copy name="comments" source="*" target="/document/comments" />
</component>
</ComponentConfig>
<ComponentConfig id="Code Block Component" enabled="True">
<component id="Code Block Component" type="SandcastleBuilder.Components.CodeBlockComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<!-- Base path for relative filenames in source attributes
<!-- Base path for relative filenames in source attributes
(optional) -->
<basePath value="{@HtmlEncProjectFolder}" />
<!-- Connect to language filter (optional). If omitted,
<basePath value="{@HtmlEncProjectFolder}" />
<!-- Connect to language filter (optional). If omitted,
language filtering is enabled by default. -->
<languageFilter value="true" />
<!-- Allow missing source files (Optional). If omitted,
<languageFilter value="true" />
<!-- Allow missing source files (Optional). If omitted,
it will generate errors if referenced source files
are missing. -->
<allowMissingSource value="false" />
<!-- Remove region markers from imported code blocks. If omitted,
<allowMissingSource value="false" />
<!-- Remove region markers from imported code blocks. If omitted,
region markers in imported code blocks are left alone. -->
<removeRegionMarkers value="false" />
<!-- Code colorizer options (required).
<removeRegionMarkers value="false" />
<!-- Code colorizer options (required).
Attributes:
Language syntax configuration file (required)
XSLT style file (required)
@ -97,48 +63,92 @@ @@ -97,48 +63,92 @@
Keep XML comment "see" tags within the code (optional)
Tab size override (optional, 0 = Use syntax file setting)
Use language name as default title (optional) -->
<colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" copyImageUrl="../icons/CopyCode.gif" language="cs" numberLines="false" outlining="false" keepSeeTags="false" tabSize="0" defaultTitle="true" />
</component>
<colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" copyImageUrl="../icons/CopyCode.gif" language="cs" numberLines="false" outlining="false" keepSeeTags="false" tabSize="0" defaultTitle="true" />
</component>
</ComponentConfig>
<ComponentConfig id="Post-transform Component" enabled="True">
<component id="Post-transform Component" type="SandcastleBuilder.Components.PostTransformComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<!-- Code colorizer files (required).
<ComponentConfig id="IntelliSense Component" enabled="True"><component id="IntelliSense Component" type="SandcastleBuilder.Components.IntelliSenseComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<!-- Output options (optional)
Attributes:
Include Namespaces (false by default)
Namespaces filename ("Namespaces" if not specified or empty)
Directory (current folder if not specified or empty) -->
<output includeNamespaces="false" namespacesFile="Namespaces" folder="{@OutputFolder}" />
</component></ComponentConfig>
<ComponentConfig id="Cached MSDN URL References" enabled="True"><component id="Cached MSDN URL References" type="SandcastleBuilder.Components.CachedResolveReferenceLinksComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll" locale="{@Locale}" linkTarget="{@SdkLinkTarget}">
<helpOutput format="HtmlHelp1">
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@HtmlSdkLinkType}" />
<targets files="reflection.xml" type="Local" />
</helpOutput>
<helpOutput format="MSHelp2">
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@MSHelp2SdkLinkType}" />
<targets files="reflection.xml" type="Index" />
</helpOutput>
<helpOutput format="MSHelpViewer">
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@MSHelpViewerSdkLinkType}" />
<targets files="reflection.xml" type="Id" />
</helpOutput>
<helpOutput format="Website">
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@WebsiteSdkLinkType}" />
<targets files="reflection.xml" type="Local" />
</helpOutput>
</component></ComponentConfig>
<ComponentConfig id="Post-transform Component" enabled="True"><component id="Post-transform Component" type="SandcastleBuilder.Components.PostTransformComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<!-- Code colorizer files (required).
Attributes:
Stylesheet file (required)
Script file (required)
"Copy" image file (required) -->
<colorizer stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" copyImage="{@SHFBFolder}Colorizer\CopyCode.gif" />
<!-- Base output path for the files (required). This should match
<colorizer stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" copyImage="{@SHFBFolder}Colorizer\CopyCode.gif" />
<!-- Base output paths for the files (required). These should match
the parent folder of the output path of the HTML files (see
SaveComponent). -->
<outputPath value="Output\" />
<!-- Logo image file (optional). Filename is required. The height,
each of the SaveComponent instances below). -->
<outputPaths>
{@HelpFormatOutputPaths}
</outputPaths>
<!-- Logo image file (optional). Filename is required. The height,
width, altText, placement, and alignment attributes are
optional. -->
<logoFile filename="" height="0" width="0" altText="" placement="left" alignment="left" />
</component>
</ComponentConfig>
</ComponentConfigurations>
<logoFile filename="" height="0" width="0" altText="" placement="left" alignment="left" />
</component></ComponentConfig>
<ComponentConfig id="Cached Reflection Index Data" enabled="True"><component id="Cached Reflection Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<index name="reflection" value="/reflection/apis/api" key="@id" cache="10">
<cache base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" cacheFile="{@LocalDataFolder}Cache\Reflection.cache" />
<data files="reflection.xml" />
</index>
<copy name="reflection" source="*" target="/document/reference" />
</component></ComponentConfig>
<ComponentConfig id="Cached Framework Comments Index Data" enabled="True"><component id="Cached Framework Comments Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<index name="comments" value="/doc/members/member" key="@name" cache="100">
{@CachedFrameworkCommentList}
{@CommentFileList}
</index>
<copy name="comments" source="*" target="/document/comments" />
</component></ComponentConfig></ComponentConfigurations>
<DocumentationSources>
<DocumentationSource sourceFile="..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj" />
</DocumentationSources>
<NamespaceSummaries>
<NamespaceSummaryItem name="(global)" isDocumented="False" />
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit" isDocumented="True">This is the main AvalonEdit namespace.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.CodeCompletion" isDocumented="True">This namespace contains classes to show the code completion window.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Document" isDocumented="True">This namespace contains the document model.
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit" isDocumented="True">This is the main AvalonEdit namespace.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.CodeCompletion" isDocumented="True">This namespace contains classes to show the code completion window.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Document" isDocumented="True">This namespace contains the document model.
The most important class here is TextDocument, which represents document that can be displayed and edited in the text editor.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Editing" isDocumented="True">This namespace is the home of the TextArea class. It manages user input and handles the caret and the selection.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Folding" isDocumented="True">This namespace contains the folding (code collapsing) implementation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Highlighting" isDocumented="True">This namespace contains the engine for highlighting text documents (DocumentHighlighter).
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Editing" isDocumented="True">This namespace is the home of the TextArea class. It manages user input and handles the caret and the selection.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Folding" isDocumented="True">This namespace contains the folding (code collapsing) implementation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Highlighting" isDocumented="True">This namespace contains the engine for highlighting text documents (DocumentHighlighter).
Additionally, the class HighlightingColorizer provides integration of the highlighting engine into the text editor GUI.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Highlighting.Xshd" isDocumented="True">This namespace contains a document model for syntax highlighting definitions (.xshd files).</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Indentation" isDocumented="True">This namespace contains the logic for automatic indentation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Rendering" isDocumented="True">This namespace contains the text rendering infrastructure.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Utils" isDocumented="True">This namespace contains various utility classes.</NamespaceSummaryItem>
<NamespaceSummaryItem name="XamlGeneratedNamespace" isDocumented="False" />
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Xml" isDocumented="True">This namespace contains an error-tolerant XML parser with support for incremental parsing, only reparsing the changed regions of a TextDocument.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Snippets" isDocumented="True">Snippets perform automatic text insertion. Snippets can be interactive after they were expanded, for example to allow the user to easily replace fields in the expanded snippet.</NamespaceSummaryItem></NamespaceSummaries>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Highlighting.Xshd" isDocumented="True">This namespace contains a document model for syntax highlighting definitions (.xshd files).</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Indentation" isDocumented="True">This namespace contains the logic for automatic indentation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Rendering" isDocumented="True">This namespace contains the text rendering infrastructure.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Utils" isDocumented="True">This namespace contains various utility classes.</NamespaceSummaryItem>
<NamespaceSummaryItem name="XamlGeneratedNamespace" isDocumented="False" />
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Xml" isDocumented="True">This namespace contains an error-tolerant XML parser with support for incremental parsing, only reparsing the changed regions of a TextDocument.</NamespaceSummaryItem>
<NamespaceSummaryItem name="ICSharpCode.AvalonEdit.Snippets" isDocumented="True">Snippets perform automatic text insertion. Snippets can be interactive after they were expanded, for example to allow the user to easily replace fields in the expanded snippet.</NamespaceSummaryItem>
</NamespaceSummaries>
<CleanIntermediates>True</CleanIntermediates>
<SyntaxFilters>Standard</SyntaxFilters>
</PropertyGroup>

13
src/Libraries/AvalonEdit/Documentation/Text Rendering.aml
Unescape View File

@ -153,9 +153,16 @@ @@ -153,9 +153,16 @@
</para>
<para>
These are the predefined layers:
<list class="bullet"><listItem>Background layer: renders the background colors associated with the visual elements</listItem><listItem>Selection layer: renders the background of the selection</listItem><listItem>Text layer: renders the TextLines that were constructed during the Measure step.
The text layer also serves as container for any inline UI elements.
</listItem><listItem>Caret layer: renders a blinking caret</listItem></list>
<list class="bullet">
<listItem>Background layer: renders the background colors associated with the visual elements</listItem>
<listItem>Selection layer: renders the background of the selection</listItem>
<listItem>Text layer: renders the TextLines that were constructed during the Measure step.
Starting with AvalonEdit 4.1, the TextLayer uses child elements to draw the text: one DrawingVisual for each VisualLine.
</listItem>
<listItem>
Immediately after the text layer, any inline UI elements are placed as if they were separate layers.
</listItem>
<listItem>Caret layer: renders a blinking caret</listItem></list>
It's also possible to insert new layers into the TextView using the
<codeEntityReference qualifyHint="true">M:ICSharpCode.AvalonEdit.Rendering.TextView.InsertLayer(System.Windows.UIElement,ICSharpCode.AvalonEdit.Rendering.KnownLayer,ICSharpCode.AvalonEdit.Rendering.LayerInsertionPosition)</codeEntityReference>
method.

1
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/InsightWindow.cs
Unescape View File

@ -76,7 +76,6 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion @@ -76,7 +76,6 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
/// </summary>
internal sealed class InsightWindowTemplateSelector : DataTemplateSelector
{
/// <inheritdoc/>
public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (item is string)

1
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/ISegment.cs
Unescape View File

@ -127,7 +127,6 @@ namespace ICSharpCode.AvalonEdit.Document @@ -127,7 +127,6 @@ namespace ICSharpCode.AvalonEdit.Document
return !left.Equals(right);
}
/// <inheritdoc/>
public override string ToString()
{
return "[Offset=" + Offset.ToString(CultureInfo.InvariantCulture) + ", Length=" + Length.ToString(CultureInfo.InvariantCulture) + "]";

1
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LinkElementGenerator.cs
Unescape View File

@ -126,7 +126,6 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -126,7 +126,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
{
}
/// <inheritdoc/>
protected override Uri GetUriFromMatch(Match match)
{
return new Uri("mailto:" + match.Value);

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/NewLineElementGenerator.cs
Unescape View File

@ -26,7 +26,6 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -26,7 +26,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
{
}
/// <inheritdoc/>
public override int GetFirstInterestedOffset(int startOffset)
{
DocumentLine lastDocumentLine = CurrentContext.VisualLine.LastDocumentLine;
@ -36,7 +35,6 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -36,7 +35,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
return -1;
}
/// <inheritdoc/>
public override VisualLineElement ConstructElement(int offset)
{
string newlineText;

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs
Unescape View File

@ -56,7 +56,6 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -56,7 +56,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
this.ShowBoxForControlCharacters = options.ShowBoxForControlCharacters;
}
/// <inheritdoc/>
public override int GetFirstInterestedOffset(int startOffset)
{
DocumentLine endLine = CurrentContext.VisualLine.LastDocumentLine;
@ -83,7 +82,6 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -83,7 +82,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
return -1;
}
/// <inheritdoc/>
public override VisualLineElement ConstructElement(int offset)
{
char c = CurrentContext.Document.GetCharAt(offset);

18
src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsHelper.cs
Unescape View File

@ -113,9 +113,21 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -113,9 +113,21 @@ namespace ICSharpCode.SharpDevelop.Refactoring
public ObservableCollection<ContextActionViewModel> BuildTreeViewModel(IEnumerable<ITreeNode<IClass>> classTree)
{
return new ObservableCollection<ContextActionViewModel>(
classTree.Select(
node => MakeGoToMemberAction(node.Content, BuildTreeViewModel(node.Children))).Where(action => action != null));
ObservableCollection<ContextActionViewModel> c = new ObservableCollection<ContextActionViewModel>();
foreach (var node in classTree) {
var childNodes = BuildTreeViewModel(node.Children);
var action = MakeGoToMemberAction(node.Content, childNodes);
if (action != null) {
c.Add(action);
} else {
// If the member doesn't exist in the derived class, directly append the
// children of that derived class here.
c.AddRange(childNodes);
// This is necessary so that the method C.M() is shown in the case
// "class A { virtual void M(); } class B : A {} class C : B { override void M(); }"
}
}
return c;
}
}
}

17
src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
Unescape View File

@ -140,6 +140,19 @@ namespace ICSharpCode.Core @@ -140,6 +140,19 @@ namespace ICSharpCode.Core
}
}
static string windowsSdk71InstallRoot = null;
/// <summary>
/// Location of the .NET 4.0 SDK (Windows SDK 7.1) install root.
/// </summary>
public static string WindowsSdk71InstallRoot {
get {
if (windowsSdk71InstallRoot == null) {
windowsSdk71InstallRoot = GetPathFromRegistry(@"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1", "InstallationFolder") ?? string.Empty;
}
return windowsSdk71InstallRoot;
}
}
#endregion
[Obsolete("Use System.IO.Path.Combine instead")]
@ -202,6 +215,10 @@ namespace ICSharpCode.Core @@ -202,6 +215,10 @@ namespace ICSharpCode.Core
/// <returns>The path of the executable, or null if the exe is not found.</returns>
public static string GetSdkPath(string exeName) {
string execPath;
if (!string.IsNullOrEmpty(WindowsSdk71InstallRoot)) {
execPath = Path.Combine(WindowsSdk71InstallRoot, "bin\\" + exeName);
if (File.Exists(execPath)) { return execPath; }
}
if (!string.IsNullOrEmpty(WindowsSdk70InstallRoot)) {
execPath = Path.Combine(WindowsSdk70InstallRoot, "bin\\" + exeName);
if (File.Exists(execPath)) { return execPath; }

4
src/Tools/UpdateAssemblyInfo/Main.cs
Unescape View File

@ -19,8 +19,8 @@ namespace UpdateAssemblyInfo @@ -19,8 +19,8 @@ namespace UpdateAssemblyInfo
// Updates the version numbers in the assembly information.
class MainClass
{
const string BaseCommit = "6eceaaafce5ed9b45d19a1645b1b012675aac996";
const int BaseCommitRev = 6450;
const string BaseCommit = "4b2d4a664466e1e784e6c5be367966c426d14ef8";
const int BaseCommitRev = 7999;
const string globalAssemblyInfoTemplateFile = "src/Main/GlobalAssemblyInfo.template";
static readonly TemplateFile[] templateFiles = {

Write Preview
Loading…
Cancel
Save