Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit fdb8749

Browse files
dgrunwalddgrunwald
committed
Update to AvalonEdit 5.0.1 from the standalone AvalonEdit repository.
1 parent 37efb85 commit fdb8749

120 files changed

Lines changed: 2034 additions & 232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎SharpDevelop.Tests.sln‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,10 @@ Global
290290
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
291291
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
292292
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
293-
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
294-
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
295-
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
296-
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Release|Any CPU.Build.0 = Release|Any CPU
293+
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Debug|Any CPU.ActiveCfg = Debug|WithNRefactory
294+
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Debug|Any CPU.Build.0 = Debug|WithNRefactory
295+
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Release|Any CPU.ActiveCfg = Release|WithNRefactory
296+
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}.Release|Any CPU.Build.0 = Release|WithNRefactory
297297
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
298298
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
299299
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
@@ -322,10 +322,10 @@ Global
322322
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU
323323
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU
324324
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.Build.0 = Release|Any CPU
325-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
326-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
327-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
328-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|Any CPU
325+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|WithNRefactory
326+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|WithNRefactory
327+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|WithNRefactory
328+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|WithNRefactory
329329
{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
330330
{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.Build.0 = Debug|Any CPU
331331
{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎SharpDevelop.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ Global
263263
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU
264264
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU
265265
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.Build.0 = Release|Any CPU
266-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
267-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
268-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
269-
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|Any CPU
266+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|WithNRefactory
267+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|WithNRefactory
268+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|WithNRefactory
269+
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|WithNRefactory
270270
{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
271271
{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.Build.0 = Debug|Any CPU
272272
{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingStrategy.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ string GetIndentationString(ITextEditor editor)
9494
convertTabsToSpaces = effectiveConvertTabsToSpaces.Value;
9595
}
9696

97-
return ICSharpCode.AvalonEdit.TextEditorOptions.GetIndentationString(1, indentationSize, convertTabsToSpaces);
97+
if (convertTabsToSpaces)
98+
return new string(' ', indentationSize);
99+
else
100+
return "\t";
98101
}
99102

100103
/* NR indent engine (temporarily?) disabled as per #447

‎src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ContextActions/GoToEntityAction.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using ICSharpCode.AvalonEdit.CodeCompletion;
2424
using ICSharpCode.NRefactory.TypeSystem;
2525
using ICSharpCode.SharpDevelop;
26+
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
2627
using ICSharpCode.SharpDevelop.Editor.ContextActions;
2728
using ICSharpCode.SharpDevelop.Refactoring;
2829

‎src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/QuickClassBrowser.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
using ICSharpCode.NRefactory.TypeSystem;
2727
using ICSharpCode.NRefactory.TypeSystem.Implementation;
2828
using ICSharpCode.SharpDevelop;
29+
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
2930
using ICSharpCode.SharpDevelop.Parser;
3031
using ICSharpCode.SharpDevelop.Project;
3132

‎src/Libraries/AvalonEdit/.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# ignore all obj and bin folders (even in subdirectories)
2+
obj/
3+
bin/
4+
/Documentation/Help
5+
/packages/AvalonEdit
6+
/packages/AvalonEdit.Sample
7+
/packages/NUnit.2.6.3

‎src/Libraries/AvalonEdit/Documentation/ICSharpCode.AvalonEdit.shfbproj‎

Lines changed: 67 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
<ComponentConfigurations>
4040
<ComponentConfig id="Code Block Component" enabled="True">
4141
<component id="Code Block Component" type="SandcastleBuilder.Components.CodeBlockComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
42-
<!-- Base path for relative filenames in source attributes (optional) -->
43-
<basePath value="{@HtmlEncProjectFolder}" />
44-
<!-- Base output paths for the files (required). These should match the parent folder of the output path
42+
<!-- Base path for relative filenames in source attributes (optional) -->
43+
<basePath value="{@HtmlEncProjectFolder}" />
44+
<!-- Base output paths for the files (required). These should match the parent folder of the output path
4545
of the HTML files (see each of the SaveComponent instances in the configuration files). -->
46-
<outputPaths>
46+
<outputPaths>
4747
{@HelpFormatOutputPaths}
4848
</outputPaths>
49-
<!-- Allow missing source files (Optional). If omitted, it will generate errors if referenced source files
49+
<!-- Allow missing source files (Optional). If omitted, it will generate errors if referenced source files
5050
are missing. -->
51-
<allowMissingSource value="false" />
52-
<!-- Remove region markers from imported code blocks. If omitted, region markers in imported code blocks
51+
<allowMissingSource value="false" />
52+
<!-- Remove region markers from imported code blocks. If omitted, region markers in imported code blocks
5353
are left alone. -->
54-
<removeRegionMarkers value="false" />
55-
<!-- Code colorizer options (required).
54+
<removeRegionMarkers value="false" />
55+
<!-- Code colorizer options (required).
5656
Attributes:
5757
Language syntax configuration file (required)
5858
XSLT stylesheet file (required)
@@ -65,58 +65,68 @@
6565
Keep XML comment "see" tags within the code (optional)
6666
Tab size override (optional, 0 = Use syntax file setting)
6767
Use language name as default title (optional) -->
68-
<colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" numberLines="false" outlining="false" keepSeeTags="false" tabSize="0" defaultTitle="true" />
69-
</component>
68+
<colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" numberLines="false" outlining="false" keepSeeTags="false" tabSize="0" defaultTitle="true" />
69+
</component>
7070
</ComponentConfig>
71-
<ComponentConfig id="IntelliSense Component" enabled="True"><component id="IntelliSense Component" type="SandcastleBuilder.Components.IntelliSenseComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
72-
<!-- Output options (optional)
71+
<ComponentConfig id="IntelliSense Component" enabled="True">
72+
<component id="IntelliSense Component" type="SandcastleBuilder.Components.IntelliSenseComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
73+
<!-- Output options (optional)
7374
Attributes:
7475
Include Namespaces (false by default)
7576
Namespaces filename ("Namespaces" if not specified or empty)
7677
Directory (current folder if not specified or empty) -->
77-
<output includeNamespaces="false" namespacesFile="Namespaces" folder="{@OutputFolder}" />
78-
</component></ComponentConfig>
79-
<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">
80-
<index name="comments" value="/doc/members/member" key="@name" cache="100">
78+
<output includeNamespaces="false" namespacesFile="Namespaces" folder="{@OutputFolder}" />
79+
</component>
80+
</ComponentConfig>
81+
<ComponentConfig id="Cached Framework Comments Index Data" enabled="True">
82+
<component id="Cached Framework Comments Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
83+
<index name="comments" value="/doc/members/member" key="@name" cache="100">
8184
{@CachedFrameworkCommentList}
8285
{@CommentFileList}
8386
</index>
84-
<copy name="comments" source="*" target="/document/comments" />
85-
</component></ComponentConfig>
86-
<ComponentConfig id="Cached Reflection Index Data" enabled="True"><component id="Cached Reflection Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
87-
<index name="reflection" value="/reflection/apis/api" key="@id" cache="10">
88-
<cache base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" cacheFile="{@LocalDataFolder}Cache\Reflection.cache" />
89-
<data files="reflection.xml" />
90-
</index>
91-
<copy name="reflection" source="*" target="/document/reference" />
92-
</component></ComponentConfig>
93-
<ComponentConfig id="API Token Resolution" enabled="True"><component id="API Token Resolution" type="Microsoft.Ddue.Tools.SharedContentComponent" assembly="{@SandcastlePath}ProductionTools\BuildComponents.dll">
87+
<copy name="comments" source="*" target="/document/comments" />
88+
</component>
89+
</ComponentConfig>
90+
<ComponentConfig id="Cached Reflection Index Data" enabled="True">
91+
<component id="Cached Reflection Index Data" type="SandcastleBuilder.Components.CachedCopyFromIndexComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
92+
<index name="reflection" value="/reflection/apis/api" key="@id" cache="10">
93+
<cache base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" cacheFile="{@LocalDataFolder}Cache\Reflection.cache" />
94+
<data files="reflection.xml" />
95+
</index>
96+
<copy name="reflection" source="*" target="/document/reference" />
97+
</component>
98+
</ComponentConfig>
99+
<ComponentConfig id="API Token Resolution" enabled="True">
100+
<component id="API Token Resolution" type="Microsoft.Ddue.Tools.SharedContentComponent" assembly="{@SandcastlePath}ProductionTools\BuildComponents.dll">
94101

95102
{@TokenFiles}
96-
<replace elements="/*//token" item="string(.)" />
97-
</component></ComponentConfig>
98-
<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}">
99-
<helpOutput format="HtmlHelp1">
100-
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
101-
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@HtmlSdkLinkType}" />
102-
<targets files="reflection.xml" type="Local" />
103-
</helpOutput>
104-
<helpOutput format="MSHelp2">
105-
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
106-
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@MSHelp2SdkLinkType}" />
107-
<targets files="reflection.xml" type="Index" />
108-
</helpOutput>
109-
<helpOutput format="MSHelpViewer">
110-
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
111-
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@MSHelpViewerSdkLinkType}" />
112-
<targets files="reflection.xml" type="Id" />
113-
</helpOutput>
114-
<helpOutput format="Website">
115-
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
116-
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@WebsiteSdkLinkType}" />
117-
<targets files="reflection.xml" type="Local" />
118-
</helpOutput>
119-
</component></ComponentConfig></ComponentConfigurations>
103+
<replace elements="/*//token" item="string(.)" /></component>
104+
</ComponentConfig>
105+
<ComponentConfig id="Cached MSDN URL References" enabled="True">
106+
<component id="Cached MSDN URL References" type="SandcastleBuilder.Components.CachedResolveReferenceLinksComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll" locale="{@Locale}" linkTarget="{@SdkLinkTarget}">
107+
<helpOutput format="HtmlHelp1">
108+
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
109+
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@HtmlSdkLinkType}" />
110+
<targets files="reflection.xml" type="Local" />
111+
</helpOutput>
112+
<helpOutput format="MSHelp2">
113+
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
114+
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@MSHelp2SdkLinkType}" />
115+
<targets files="reflection.xml" type="Index" />
116+
</helpOutput>
117+
<helpOutput format="MSHelpViewer">
118+
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
119+
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@MSHelpViewerSdkLinkType}" />
120+
<targets files="reflection.xml" type="Id" />
121+
</helpOutput>
122+
<helpOutput format="Website">
123+
<cache filename="{@LocalDataFolder}Cache\MsdnUrl.cache" />
124+
<targets base="{@SandcastlePath}Data\Reflection" recurse="true" files="*.xml" type="{@WebsiteSdkLinkType}" />
125+
<targets files="reflection.xml" type="Local" />
126+
</helpOutput>
127+
</component>
128+
</ComponentConfig>
129+
</ComponentConfigurations>
120130
<DocumentationSources>
121131
<DocumentationSource sourceFile="..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj" />
122132
</DocumentationSources>
@@ -146,6 +156,12 @@ Additionally, the class HighlightingColorizer provides integration of the highli
146156
<NamingMethod>Guid</NamingMethod>
147157
<Language>en-US</Language>
148158
<ContentPlacement>AboveNamespaces</ContentPlacement>
159+
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
160+
<HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
161+
<IndentHtml>False</IndentHtml>
162+
<KeepLogFile>True</KeepLogFile>
163+
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
164+
<CppCommentsFixup>False</CppCommentsFixup>
149165
</PropertyGroup>
150166
<!-- There are no properties for these two groups but they need to appear in
151167
order for Visual Studio to perform the build. -->

‎src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
using System;
2020
using System.Linq;
21+
#if NREFACTORY
2122
using ICSharpCode.NRefactory.Editor;
23+
#endif
2224
using NUnit.Framework;
2325

2426
namespace ICSharpCode.AvalonEdit.Document

‎src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/TextAnchorTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
using System;
2020
using System.Collections.Generic;
21+
#if NREFACTORY
2122
using ICSharpCode.NRefactory.Editor;
23+
#endif
2224
using NUnit.Framework;
2325

2426
namespace ICSharpCode.AvalonEdit.Document

‎src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/TextSegmentTreeTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
using System;
2020
using System.Collections.Generic;
21+
#if NREFACTORY
2122
using ICSharpCode.NRefactory.Editor;
23+
#endif
2224
using NUnit.Framework;
2325

2426
namespace ICSharpCode.AvalonEdit.Document

0 commit comments

Comments
 (0)