diff --git a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
index cfaa007cc..6e2a95d44 100644
--- a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
+++ b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
@@ -86,8 +86,6 @@
-
-
AttachToProcessWindow.xaml
@@ -110,10 +108,6 @@
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}
NRefactory
-
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}
- ICSharpCode.SharpDevelop.Dom
-
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}
Debugger.Core
diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs
index 82959d534..73c3e9fdc 100644
--- a/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs
+++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs
@@ -6,7 +6,6 @@ using System.Reflection;
using Debugger;
using Debugger.MetaData;
-using ICSharpCode.Core;
using ICSharpCode.NRefactory.Ast;
using ILSpy.Debugger.Services;
using ILSpy.Debugger.Services.Debugger;
diff --git a/Debugger/ILSpy.Debugger/Services/ParserService/IParser.cs b/Debugger/ILSpy.Debugger/Services/ParserService/IParser.cs
deleted file mode 100644
index ca70157f4..000000000
--- a/Debugger/ILSpy.Debugger/Services/ParserService/IParser.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using ICSharpCode.SharpDevelop.Dom;
-using ILSpy.Debugger.AvalonEdit.Editor;
-
-namespace ILSpy.Debugger.Services
-{
- public interface IParser
- {
- string[] LexerTags {
- get;
- set;
- }
-
- LanguageProperties Language {
- get;
- }
-
- IExpressionFinder CreateExpressionFinder(string fileName);
-
- ICompilationUnit Parse(IProjectContent projectContent, string fileName, ITextBuffer fileContent);
-
- IResolver CreateResolver();
- }
-}
diff --git a/Debugger/ILSpy.Debugger/Services/ParserService/Parser.cs b/Debugger/ILSpy.Debugger/Services/ParserService/Parser.cs
deleted file mode 100644
index 14b36811e..000000000
--- a/Debugger/ILSpy.Debugger/Services/ParserService/Parser.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using ICSharpCode.SharpDevelop.Dom;
-using ICSharpCode.SharpDevelop.Dom.CSharp;
-using ICSharpCode.SharpDevelop.Dom.NRefactoryResolver;
-using ILSpy.Debugger.AvalonEdit.Editor;
-
-namespace ILSpy.Debugger.Services
-{
- public class TParser : IParser
- {
- ///IParser Interface
- string[] lexerTags;
-
- public string[] LexerTags {
- get {
- return lexerTags;
- }
- set {
- lexerTags = value;
- }
- }
-
- public LanguageProperties Language {
- get {
- return LanguageProperties.CSharp;
- }
- }
-
- public IExpressionFinder CreateExpressionFinder(string fileName)
- {
- return new CSharpExpressionFinder(null);
- }
-
- void RetrieveRegions(ICompilationUnit cu, ICSharpCode.NRefactory.Parser.SpecialTracker tracker)
- {
- for (int i = 0; i < tracker.CurrentSpecials.Count; ++i) {
- ICSharpCode.NRefactory.PreprocessingDirective directive = tracker.CurrentSpecials[i] as ICSharpCode.NRefactory.PreprocessingDirective;
- if (directive != null) {
- if (directive.Cmd == "#region") {
- int deep = 1;
- for (int j = i + 1; j < tracker.CurrentSpecials.Count; ++j) {
- ICSharpCode.NRefactory.PreprocessingDirective nextDirective = tracker.CurrentSpecials[j] as ICSharpCode.NRefactory.PreprocessingDirective;
- if (nextDirective != null) {
- switch (nextDirective.Cmd) {
- case "#region":
- ++deep;
- break;
- case "#endregion":
- --deep;
- if (deep == 0) {
- cu.FoldingRegions.Add(new FoldingRegion(directive.Arg.Trim(), DomRegion.FromLocation(directive.StartPosition, nextDirective.EndPosition)));
- goto end;
- }
- break;
- }
- }
- }
- end: ;
- }
- }
- }
- }
-
- public ICompilationUnit Parse(IProjectContent projectContent, string fileName, ITextBuffer fileContent)
- {
- using (ICSharpCode.NRefactory.IParser p = ICSharpCode.NRefactory.ParserFactory.CreateParser(ICSharpCode.NRefactory.SupportedLanguage.CSharp, fileContent.CreateReader())) {
- return Parse(p, fileName, projectContent);
- }
- }
-
- ICompilationUnit Parse(ICSharpCode.NRefactory.IParser p, string fileName, IProjectContent projectContent)
- {
- p.Lexer.SpecialCommentTags = lexerTags;
- p.ParseMethodBodies = false;
- p.Parse();
-
- NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent, ICSharpCode.NRefactory.SupportedLanguage.CSharp);
- visitor.Specials = p.Lexer.SpecialTracker.CurrentSpecials;
- visitor.VisitCompilationUnit(p.CompilationUnit, null);
- visitor.Cu.FileName = fileName;
- visitor.Cu.ErrorsDuringCompile = p.Errors.Count > 0;
- RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
- AddCommentTags(visitor.Cu, p.Lexer.TagComments);
- return visitor.Cu;
- }
-
- void AddCommentTags(ICompilationUnit cu, System.Collections.Generic.List tagComments)
- {
- foreach (ICSharpCode.NRefactory.Parser.TagComment tagComment in tagComments) {
- DomRegion tagRegion = new DomRegion(tagComment.StartPosition.Y, tagComment.StartPosition.X);
- var tag = new ICSharpCode.SharpDevelop.Dom.TagComment(tagComment.Tag, tagRegion, tagComment.CommentText);
- cu.TagComments.Add(tag);
- }
- }
-
- public IResolver CreateResolver()
- {
- return new NRefactoryResolver(LanguageProperties.CSharp);
- }
- ///////// IParser Interface END
- }
-}
diff --git a/ILSpy.sln b/ILSpy.sln
index 279b1b8c8..21c655274 100644
--- a/ILSpy.sln
+++ b/ILSpy.sln
@@ -6,25 +6,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{BF
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.Debugger", "Debugger\ILSpy.Debugger\ILSpy.Debugger.csproj", "{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.Debugger", "Debugger\ILSpy.Debugger\ILSpy.Debugger.csproj", "{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{4E076A9B-159A-45C4-9E34-AE1D20D83E42}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Decompiler\lib\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Libraries\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Decompiler\lib\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy", "ILSpy\ILSpy.csproj", "{1E85EFF9-E370-4683-83E4-8A3D063FF791}"
EndProject
@@ -64,12 +62,6 @@ Global
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|Any CPU
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|x86.ActiveCfg = Release|Any CPU
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|x86.Build.0 = Release|Any CPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|x86.ActiveCfg = Release|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -117,13 +109,12 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {BF79A230-0918-47DF-8A36-776779A331DE}
{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A} = {BF79A230-0918-47DF-8A36-776779A331DE}
- {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
- {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
- {DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
- {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
+ {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {BF79A230-0918-47DF-8A36-776779A331DE}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
+ {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
+ {DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
+ {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
+ {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {4E076A9B-159A-45C4-9E34-AE1D20D83E42}
EndGlobalSection
EndGlobal
diff --git a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs b/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs
deleted file mode 100644
index 96709c90a..000000000
--- a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-
-[assembly: CLSCompliant(true)]
-[assembly: StringFreezing()]
-
-[assembly: Dependency("System.Core", LoadHint.Always)]
-
-[assembly: AssemblyTitle("ICSharpCode.SharpDevelop.Dom")]
-[assembly: AssemblyDescription("Code-completion library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
diff --git a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj b/Libraries/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj
deleted file mode 100644
index 760173cbe..000000000
--- a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-
- Library
- ICSharpCode.SharpDevelop.Dom
- ICSharpCode.SharpDevelop.Dom
- Debug
- AnyCPU
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}
- False
- ..\..\ICSharpCode.SharpDevelop.snk
- False
- File
- bin\Debug\
- False
- False
- False
- Auto
- 132644864
- AnyCPU
- 4096
- 4
- false
- v4.0
- False
- -Microsoft.Design#CA1002;-Microsoft.Design#CA1063;-Microsoft.Performance#CA1800;-Microsoft.Security#CA2104
-
-
- OnBuildSuccess
- C:\Users\Eusebiu\AppData\Roaming\ICSharpCode/SharpDevelop4.1\Settings.SourceAnalysis
-
-
- obj\Debug\
- False
- DEBUG;TRACE
- true
- Full
- True
- Project
-
-
- obj\Release\
- True
- TRACE
- False
- None
- False
-
-
-
- ..\..\..\Libraries\log4net\log4net.dll
-
-
-
- 3.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}
- NRefactory
-
-
- {D68133BD-1E63-496E-9EDE-4FBDBF77B486}
- Mono.Cecil
-
-
-
-
\ No newline at end of file
diff --git a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Src/Ambience.cs b/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Src/Ambience.cs
deleted file mode 100644
index 3065d4229..000000000
--- a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Src/Ambience.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.SharpDevelop.Dom
-{
- [Flags]
- public enum ConversionFlags
- {
- ///
- /// Convert only the name.
- ///
- None = 0,
- ///
- /// Show the parameter list
- ///
- ShowParameterList = 1,
- ///
- /// Show names for parameters
- ///
- ShowParameterNames = 2,
- ///
- /// Show the accessibility (private, public, etc.)
- ///
- ShowAccessibility = 4,
- ///
- /// Show the definition key word (class, struct, Sub, Function, etc.)
- ///
- ShowDefinitionKeyWord = 8,
- ///
- /// Show the fully qualified name for the member
- ///
- UseFullyQualifiedMemberNames = 0x10,
- ///
- /// Show modifiers (virtual, override, etc.)
- ///
- ShowModifiers = 0x20,
- ///
- /// Show the inheritance declaration
- ///
- ShowInheritanceList = 0x40,
-
- IncludeHtmlMarkup = 0x80,
- ///
- /// Show the return type
- ///
- ShowReturnType = 0x100,
- ///
- /// Use fully qualified names for return type and parameters.
- ///
- UseFullyQualifiedTypeNames = 0x200,
- ///
- /// Include opening brace (or equivalent) for methods or classes;
- /// or semicolon (or equivalent) for field, events.
- /// For properties, a block indicating if there is a getter/setter is included.
- ///
- IncludeBody = 0x400,
- ///
- /// Show the list of type parameters on method and class declarations.
- /// Type arguments for parameter/return types are always shown.
- ///
- ShowTypeParameterList = 0x800,
-
- StandardConversionFlags = ShowParameterNames |
- ShowAccessibility |
- ShowParameterList |
- ShowReturnType |
- ShowModifiers |
- ShowTypeParameterList |
- ShowDefinitionKeyWord,
-
- All = 0xfff,
- }
-
- public interface IAmbience
- {
- ConversionFlags ConversionFlags {
- get;
- set;
- }
-
- string Convert(IClass c);
- string ConvertEnd(IClass c);
-
- string Convert(IEntity e);
-
- string Convert(IField field);
- string Convert(IProperty property);
- string Convert(IEvent e);
-
- string Convert(IMethod m);
- string ConvertEnd(IMethod m);
-
- string Convert(IParameter param);
- string Convert(IReturnType returnType);
-
- string ConvertAccessibility(ModifierEnum accessibility);
-
- string WrapAttribute(string attribute);
- string WrapComment(string comment);
-
- string GetIntrinsicTypeName(string dotNetTypeName);
- }
-
- public abstract class AbstractAmbience : IAmbience
- {
- #if DEBUG
- int ownerThread = System.Threading.Thread.CurrentThread.ManagedThreadId;
- #endif
-
- [System.Diagnostics.Conditional("DEBUG")]
- protected void CheckThread()
- {
- #if DEBUG
- if (ownerThread != System.Threading.Thread.CurrentThread.ManagedThreadId)
- throw new InvalidOperationException("Ambience may only be used by the thread that created it");
- #endif
- }
-
- ConversionFlags conversionFlags = ConversionFlags.StandardConversionFlags;
-
- public ConversionFlags ConversionFlags {
- get {
- return conversionFlags;
- }
- set {
- CheckThread();
- conversionFlags = value;
- }
- }
-
- public bool ShowReturnType {
- get {
- return (conversionFlags & ConversionFlags.ShowReturnType) == ConversionFlags.ShowReturnType;
- }
- }
-
- public bool ShowAccessibility {
- get {
- return (conversionFlags & ConversionFlags.ShowAccessibility) == ConversionFlags.ShowAccessibility;
- }
- }
-
- public bool ShowParameterNames {
- get {
- return (conversionFlags & ConversionFlags.ShowParameterNames) == ConversionFlags.ShowParameterNames;
- }
- }
-
- public bool UseFullyQualifiedTypeNames {
- get {
- return (conversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) == ConversionFlags.UseFullyQualifiedTypeNames;
- }
- }
-
- public bool ShowDefinitionKeyWord {
- get {
- return (conversionFlags & ConversionFlags.ShowDefinitionKeyWord) == ConversionFlags.ShowDefinitionKeyWord;
- }
- }
-
- public bool ShowParameterList {
- get {
- return (conversionFlags & ConversionFlags.ShowParameterList) == ConversionFlags.ShowParameterList;
- }
- }
-
- public bool ShowModifiers {
- get {
- return (conversionFlags & ConversionFlags.ShowModifiers) == ConversionFlags.ShowModifiers;
- }
- }
-
- public bool ShowInheritanceList {
- get {
- return (conversionFlags & ConversionFlags.ShowInheritanceList) == ConversionFlags.ShowInheritanceList;
- }
- }
-
- public bool IncludeHtmlMarkup {
- get {
- return (conversionFlags & ConversionFlags.IncludeHtmlMarkup) == ConversionFlags.IncludeHtmlMarkup;
- }
- }
-
- public bool UseFullyQualifiedMemberNames {
- get {
- return (conversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames;
- }
- }
-
- public bool IncludeBody {
- get {
- return (conversionFlags & ConversionFlags.IncludeBody) == ConversionFlags.IncludeBody;
- }
- }
-
- public bool ShowTypeParameterList {
- get {
- return (conversionFlags & ConversionFlags.ShowTypeParameterList) == ConversionFlags.ShowTypeParameterList;
- }
- }
-
- public abstract string Convert(IClass c);
- public abstract string ConvertEnd(IClass c);
- public abstract string Convert(IField c);
- public abstract string Convert(IProperty property);
- public abstract string Convert(IEvent e);
- public abstract string Convert(IMethod m);
- public abstract string ConvertEnd(IMethod m);
- public abstract string Convert(IParameter param);
- public abstract string Convert(IReturnType returnType);
-
- public virtual string Convert(IEntity entity)
- {
- if (entity == null)
- throw new ArgumentNullException("entity");
- IClass c = entity as IClass;
- if (c != null)
- return Convert(c);
- IMethod m = entity as IMethod;
- if (m != null)
- return Convert(m);
- IField f = entity as IField;
- if (f != null)
- return Convert(f);
- IProperty p = entity as IProperty;
- if (p != null)
- return Convert(p);
- IEvent e = entity as IEvent;
- if (e != null)
- return Convert(e);
- return entity.ToString();
- }
-
- public abstract string WrapAttribute(string attribute);
- public abstract string WrapComment(string comment);
- public abstract string GetIntrinsicTypeName(string dotNetTypeName);
- public abstract string ConvertAccessibility(ModifierEnum accessibility);
- }
-}
diff --git a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Src/BusyManager.cs b/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Src/BusyManager.cs
deleted file mode 100644
index e7b8f5b0e..000000000
--- a/Libraries/ICSharpCode.SharpDevelop.Dom/Project/Src/BusyManager.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.SharpDevelop.Dom
-{
- ///
- /// This class is used to prevent stack overflows by representing a 'busy' flag
- /// that prevents reentrance when another call is running.
- /// However, using a simple 'bool busy' is not thread-safe, so we use a
- /// thread-static BusyManager.
- ///
- sealed class BusyManager
- {
- public struct BusyLock : IDisposable
- {
- public static readonly BusyLock Failed = new BusyLock(null);
-
- readonly BusyManager manager;
-
- public BusyLock(BusyManager manager)
- {
- this.manager = manager;
- }
-
- public bool Success {
- get { return manager != null; }
- }
-
- public void Dispose()
- {
- if (manager != null) {
- manager.activeObjects.RemoveAt(manager.activeObjects.Count - 1);
- }
- }
- }
-
- readonly List