Browse Source

Code cleanup.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5245 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
37115adab8
  1. 6
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WorkbenchTextFileReader.cs
  2. 4
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs
  3. 5
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/PropertyDescriptionService.cs
  4. 6
      src/AddIns/Misc/UnitTesting/Test/Utils/MockClass.cs
  5. 27
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  6. 0
      src/Main/Base/Project/Src/Bookmarks/BookmarkBase.cs
  7. 0
      src/Main/Base/Project/Src/Bookmarks/BookmarkConverter.cs
  8. 0
      src/Main/Base/Project/Src/Bookmarks/BookmarkEventHandler.cs
  9. 0
      src/Main/Base/Project/Src/Bookmarks/BookmarkManager.cs
  10. 0
      src/Main/Base/Project/Src/Bookmarks/ClassMemberBookmark.cs
  11. 0
      src/Main/Base/Project/Src/Bookmarks/Commands/MenuCommands.cs
  12. 0
      src/Main/Base/Project/Src/Bookmarks/IBookmarkMargin.cs
  13. 0
      src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
  14. 0
      src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
  15. 0
      src/Main/Base/Project/Src/Bookmarks/Pad/Nodes/BookmarkFolderNode.cs
  16. 0
      src/Main/Base/Project/Src/Bookmarks/Pad/Nodes/BookmarkNode.cs
  17. 0
      src/Main/Base/Project/Src/Bookmarks/SDBookmark.cs
  18. 0
      src/Main/Base/Project/Src/Bookmarks/SDMarkerBookmark.cs
  19. 1
      src/Main/Base/Project/Src/TextEditor/Commands/GenerateCodeCommand.cs
  20. 1
      src/Main/Base/Project/Src/TextEditor/Commands/ToolCommands.cs
  21. 215
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs
  22. 1
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/ITextAreaControlProvider.cs
  23. 4
      src/Main/Base/Test/ReflectionLayerTests.cs
  24. 6
      src/Main/Base/Test/Utils/MockClass.cs
  25. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/CompoundClass.cs
  26. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultClass.cs
  27. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultReturnType.cs
  28. 20
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IClass.cs

6
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WorkbenchTextFileReader.cs

@ -29,11 +29,7 @@ namespace ICSharpCode.WixBinding @@ -29,11 +29,7 @@ namespace ICSharpCode.WixBinding
/// </summary>
public TextReader Create(string fileName)
{
ITextEditorControlProvider textEditorProvider = FileService.GetOpenFile(fileName) as ITextEditorControlProvider;
if (textEditorProvider != null) {
return new StringReader(textEditorProvider.TextEditorControl.Text);
}
return new StreamReader(fileName, true);
return ParserService.GetParseableFileContent(fileName).CreateReader();
}
}
}

4
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs

@ -258,7 +258,7 @@ namespace ICSharpCode.XamlBinding @@ -258,7 +258,7 @@ namespace ICSharpCode.XamlBinding
if (!descriptionCreated) {
string entityDoc = ctor.Documentation;
if (!string.IsNullOrEmpty(entityDoc)) {
description = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.CodeCompletionData.ConvertDocumentation(entityDoc);
description = CodeCompletionItem.ConvertDocumentation(entityDoc);
}
descriptionCreated = true;
}
@ -296,7 +296,7 @@ namespace ICSharpCode.XamlBinding @@ -296,7 +296,7 @@ namespace ICSharpCode.XamlBinding
if (!descriptionCreated) {
string entityDoc = member.Documentation;
if (!string.IsNullOrEmpty(entityDoc)) {
description = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.CodeCompletionData.ConvertDocumentation(entityDoc);
description = CodeCompletionItem.ConvertDocumentation(entityDoc);
}
descriptionCreated = true;
}

5
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/PropertyDescriptionService.cs

@ -7,9 +7,8 @@ @@ -7,9 +7,8 @@
using System;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
namespace ICSharpCode.WpfDesign.AddIn
{
@ -32,7 +31,7 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -32,7 +31,7 @@ namespace ICSharpCode.WpfDesign.AddIn
if (c != null) {
IMember m = DefaultProjectContent.GetMemberByReflectionName(c, property.Name);
if (m != null)
return CodeCompletionData.ConvertDocumentation(m.Documentation);
return CodeCompletionItem.ConvertDocumentation(m.Documentation);
}
}
return null;

6
src/AddIns/Misc/UnitTesting/Test/Utils/MockClass.cs

@ -392,5 +392,11 @@ namespace UnitTesting.Tests.Utils @@ -392,5 +392,11 @@ namespace UnitTesting.Tests.Utils
public EntityType EntityType {
get { return EntityType.Class; }
}
public bool AddDefaultConstructorIfRequired {
get {
throw new NotImplementedException();
}
}
}
}

27
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -559,17 +559,17 @@ @@ -559,17 +559,17 @@
<EmbeddedResource Include="Resources\SelectStylePanel.xfrm" />
<EmbeddedResource Include="Resources\TaskListOptions.xfrm" />
<EmbeddedResource Include="Resources\WordCountDialog.xfrm" />
<Compile Include="Src\TextEditor\Bookmarks\BookmarkBase.cs" />
<Compile Include="Src\TextEditor\Bookmarks\Commands\MenuCommands.cs" />
<Compile Include="Src\TextEditor\Bookmarks\IBookmarkMargin.cs" />
<Compile Include="Src\TextEditor\Bookmarks\Pad\Nodes\BookmarkFolderNode.cs" />
<Compile Include="Src\TextEditor\Bookmarks\Pad\Nodes\BookmarkNode.cs" />
<Compile Include="Src\TextEditor\Bookmarks\Pad\BookmarkPad.cs" />
<Compile Include="Src\TextEditor\Bookmarks\Pad\BookmarkPadToolbarCommands.cs" />
<Compile Include="Src\TextEditor\Bookmarks\SDBookmark.cs" />
<Compile Include="Src\TextEditor\Bookmarks\BookmarkEventHandler.cs" />
<Compile Include="Src\TextEditor\Bookmarks\BookmarkManager.cs" />
<Compile Include="Src\TextEditor\Bookmarks\SDMarkerBookmark.cs" />
<Compile Include="Src\Bookmarks\BookmarkBase.cs" />
<Compile Include="Src\Bookmarks\Commands\MenuCommands.cs" />
<Compile Include="Src\Bookmarks\IBookmarkMargin.cs" />
<Compile Include="Src\Bookmarks\Pad\Nodes\BookmarkFolderNode.cs" />
<Compile Include="Src\Bookmarks\Pad\Nodes\BookmarkNode.cs" />
<Compile Include="Src\Bookmarks\Pad\BookmarkPad.cs" />
<Compile Include="Src\Bookmarks\Pad\BookmarkPadToolbarCommands.cs" />
<Compile Include="Src\Bookmarks\SDBookmark.cs" />
<Compile Include="Src\Bookmarks\BookmarkEventHandler.cs" />
<Compile Include="Src\Bookmarks\BookmarkManager.cs" />
<Compile Include="Src\Bookmarks\SDMarkerBookmark.cs" />
<Compile Include="Src\TextEditor\ClipboardHandling.cs" />
<Compile Include="Src\TextEditor\Codons\AddInTreeSyntaxModeProvider.cs" />
<Compile Include="Src\TextEditor\Codons\SyntaxModeDoozer.cs" />
@ -593,7 +593,6 @@ @@ -593,7 +593,6 @@
<Compile Include="Src\TextEditor\Commands\SearchCommands.cs" />
<Compile Include="Src\TextEditor\Commands\ToolCommands.cs" />
<Compile Include="Src\TextEditor\Conditions\TextContentCondition.cs" />
<Compile Include="Src\TextEditor\Gui\Editor\CompletionWindow\CodeCompletionData.cs" />
<Compile Include="Src\TextEditor\Gui\Editor\ITextAreaControlProvider.cs" />
<Compile Include="Src\TextEditor\Gui\Editor\SharpDevelopTextEditorProperties.cs" />
<Compile Include="Src\TextEditor\CharacterEncodings.cs" />
@ -631,8 +630,8 @@ @@ -631,8 +630,8 @@
<Compile Include="Src\Gui\BrowserDisplayBinding\ExtendedWebBrowser.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\TextEditor\Bookmarks\BookmarkConverter.cs" />
<Compile Include="Src\TextEditor\Bookmarks\ClassMemberBookmark.cs" />
<Compile Include="Src\Bookmarks\BookmarkConverter.cs" />
<Compile Include="Src\Bookmarks\ClassMemberBookmark.cs" />
<Compile Include="Src\TextEditor\Commands\ClassMemberMenuBuilder.cs" />
<Compile Include="Src\Services\RefactoringService\RefactoringService.cs" />
<Compile Include="Src\Services\RefactoringService\Reference.cs" />

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkBase.cs → src/Main/Base/Project/Src/Bookmarks/BookmarkBase.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkConverter.cs → src/Main/Base/Project/Src/Bookmarks/BookmarkConverter.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkEventHandler.cs → src/Main/Base/Project/Src/Bookmarks/BookmarkEventHandler.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkManager.cs → src/Main/Base/Project/Src/Bookmarks/BookmarkManager.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/ClassMemberBookmark.cs → src/Main/Base/Project/Src/Bookmarks/ClassMemberBookmark.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/Commands/MenuCommands.cs → src/Main/Base/Project/Src/Bookmarks/Commands/MenuCommands.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/IBookmarkMargin.cs → src/Main/Base/Project/Src/Bookmarks/IBookmarkMargin.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs → src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPadToolbarCommands.cs → src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/Nodes/BookmarkFolderNode.cs → src/Main/Base/Project/Src/Bookmarks/Pad/Nodes/BookmarkFolderNode.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/Nodes/BookmarkNode.cs → src/Main/Base/Project/Src/Bookmarks/Pad/Nodes/BookmarkNode.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/SDBookmark.cs → src/Main/Base/Project/Src/Bookmarks/SDBookmark.cs

0
src/Main/Base/Project/Src/TextEditor/Bookmarks/SDMarkerBookmark.cs → src/Main/Base/Project/Src/Bookmarks/SDMarkerBookmark.cs

1
src/Main/Base/Project/Src/TextEditor/Commands/GenerateCodeCommand.cs

@ -18,6 +18,7 @@ using ICSharpCode.TextEditor.Document; @@ -18,6 +18,7 @@ using ICSharpCode.TextEditor.Document;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
[Obsolete]
public class GenerateCodeAction : AbstractMenuCommand
{
public override void Run()

1
src/Main/Base/Project/Src/TextEditor/Commands/ToolCommands.cs

@ -21,6 +21,7 @@ using ICSharpCode.TextEditor.Document; @@ -21,6 +21,7 @@ using ICSharpCode.TextEditor.Document;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
[Obsolete]
public class QuickDocumentation : AbstractMenuCommand
{
public override void Run()

215
src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs

@ -1,215 +0,0 @@ @@ -1,215 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
// <version>$Revision$</version>
// </file>
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using System;
using System.Drawing;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Gui.CompletionWindow;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{
[Obsolete]
public class CodeCompletionData : ICompletionData
{
IEntity entity;
int imageIndex;
int overloads;
string text;
string description;
string documentation;
double priority;
/// <summary>
/// Gets the class this CodeCompletionData object was created for.
/// Returns null if the CodeCompletionData object was created for a method/property etc.
/// </summary>
public IClass Class {
get {
return entity as IClass;
}
}
/// <summary>
/// Gets the member this CodeCompletionData object was created for.
/// Returns null if the CodeCompletionData object was created for a class or namespace.
/// </summary>
public IMember Member {
get {
return entity as IMember;
}
}
/// <summary>
/// Gets the class or member this CodeCompletionData object was created for.
/// </summary>
public IEntity Entity {
get {
return entity;
}
}
public int Overloads {
get {
return overloads;
}
set {
overloads = value;
}
}
public double Priority {
get {
return priority;
}
set {
priority = value;
}
}
public int ImageIndex {
get {
return imageIndex;
}
set {
imageIndex = value;
}
}
public string Text {
get {
return text;
}
set {
text = value;
}
}
public string Description {
get {
// don't give a description string, if no documentation or description is provided
if (description.Length == 0 && (documentation == null || documentation.Length == 0)) {
return "";
}
if (documentation == null) {
if (entity != null)
documentation = ConvertDocumentation(entity.Documentation);
else
documentation = "";
}
return description + (overloads > 0 ? " " + StringParser.Parse("${res:ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.CodeCompletionData.OverloadsCounter}", new string[,] {{"NumOverloads", overloads.ToString()}}) : String.Empty) + "\n" + documentation;
}
set {
description = value;
}
}
string dotnetName;
void InitializePriority(string dotnetName)
{
this.dotnetName = dotnetName;
priority = CodeCompletionDataUsageCache.GetPriority(dotnetName, true);
}
public CodeCompletionData(string s, int imageIndex)
{
description = documentation = String.Empty;
text = s;
this.imageIndex = imageIndex;
InitializePriority(s);
}
public CodeCompletionData(IClass c)
{
IAmbience ambience = AmbienceService.GetCurrentAmbience();
// save class (for the delegate description shortcut)
this.entity = c;
imageIndex = ClassBrowserIconService.GetIcon(c).ImageIndex;
ambience.ConversionFlags = ConversionFlags.ShowTypeParameterList;
text = ambience.Convert(c);
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.UseFullyQualifiedMemberNames;
description = ambience.Convert(c);
InitializePriority(c.DotNetName);
}
public CodeCompletionData(IMember member)
{
this.entity = member;
imageIndex = ClassBrowserIconService.GetIcon(member).ImageIndex;
IAmbience ambience = AmbienceService.GetCurrentAmbience();
ambience.ConversionFlags = ConversionFlags.None;
text = ambience.Convert(member);
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
description = ambience.Convert(member);
InitializePriority(member.DotNetName);
}
public CodeCompletionData(IMethod method) : this((IMember)method)
{
}
public CodeCompletionData(IField field) : this((IMember)field)
{
}
public CodeCompletionData(IProperty property) : this((IMember)property)
{
}
public CodeCompletionData(IEvent e) : this((IMember)e)
{
}
public bool InsertAction(TextArea textArea, char ch)
{
if (dotnetName != null) {
CodeCompletionDataUsageCache.IncrementUsage(dotnetName);
}
IClass c = this.Class;
if (c != null && text.Length > c.Name.Length) {
textArea.InsertString(text.Substring(0, c.Name.Length + 1));
TextLocation start = textArea.Caret.Position;
TextLocation end;
int pos = text.IndexOf(',');
if (pos < 0) {
textArea.InsertString(text.Substring(c.Name.Length + 1));
end = textArea.Caret.Position;
end.X -= 1;
} else {
textArea.InsertString(text.Substring(c.Name.Length + 1, pos - c.Name.Length - 1));
end = textArea.Caret.Position;
textArea.InsertString(text.Substring(pos));
}
textArea.Caret.Position = start;
textArea.SelectionManager.SetSelection(start, end);
if (!char.IsLetterOrDigit(ch)) {
return true;
}
} else {
textArea.InsertString(text);
}
return false;
}
/// <summary>
/// Converts the xml documentation string into a plain text string.
/// </summary>
public static string ConvertDocumentation(string doc)
{
return CodeCompletionItem.ConvertDocumentation(doc);
}
}
}

1
src/Main/Base/Project/Src/TextEditor/Gui/Editor/ITextAreaControlProvider.cs

@ -11,6 +11,7 @@ using ICSharpCode.TextEditor; @@ -11,6 +11,7 @@ using ICSharpCode.TextEditor;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{
[Obsolete]
public interface ITextEditorControlProvider : ITextEditorProvider
{
TextEditorControl TextEditorControl {

4
src/Main/Base/Test/ReflectionLayerTests.cs

@ -176,7 +176,7 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -176,7 +176,7 @@ namespace ICSharpCode.SharpDevelop.Tests
{
IClass c = mscorlib.GetClass("System.DateTime", 0);
Assert.IsFalse(c.Methods.Any(p => p.IsConstructor && p.Parameters.Count == 0));
Assert.IsTrue(c.GetAddDefaultConstructorIfRequired());
Assert.IsTrue(c.AddDefaultConstructorIfRequired);
}
[Test]
@ -184,7 +184,7 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -184,7 +184,7 @@ namespace ICSharpCode.SharpDevelop.Tests
{
IClass c = mscorlib.GetClass("System.Text.EncodingInfo", 0);
Assert.IsFalse(c.Methods.Any(p => p.IsConstructor)); // EncodingInfo only has an internal constructor
Assert.IsFalse(c.GetAddDefaultConstructorIfRequired());
Assert.IsFalse(c.AddDefaultConstructorIfRequired);
}
[Test]

6
src/Main/Base/Test/Utils/MockClass.cs

@ -360,5 +360,11 @@ namespace ICSharpCode.SharpDevelop.Tests.Utils @@ -360,5 +360,11 @@ namespace ICSharpCode.SharpDevelop.Tests.Utils
public EntityType EntityType {
get { return EntityType.Class; }
}
public bool AddDefaultConstructorIfRequired {
get {
throw new NotImplementedException();
}
}
}
}

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/CompoundClass.cs

@ -108,7 +108,7 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -108,7 +108,7 @@ namespace ICSharpCode.SharpDevelop.Dom
this.Events.AddRange(part.Events);
this.Fields.AddRange(part.Fields);
this.AddDefaultConstructorIfRequired |= part.GetAddDefaultConstructorIfRequired();
this.AddDefaultConstructorIfRequired |= part.AddDefaultConstructorIfRequired;
}
this.CompilationUnit.FileName = shortestFileName;
if ((modifier & ModifierEnum.VisibilityMask) == ModifierEnum.None) {

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultClass.cs

@ -12,7 +12,7 @@ using System.Threading; @@ -12,7 +12,7 @@ using System.Threading;
namespace ICSharpCode.SharpDevelop.Dom
{
public class DefaultClass : AbstractEntity, IClass2, IComparable
public class DefaultClass : AbstractEntity, IClass, IComparable
{
ClassType classType;
DomRegion region;

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultReturnType.cs

@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Dom
using (var busyLock = busyManager.Enter(this)) {
if (busyLock.Success) {
l.AddRange(c.Methods);
if (c.GetAddDefaultConstructorIfRequired() && !c.IsStatic) {
if (c.AddDefaultConstructorIfRequired && !c.IsStatic) {
// A constructor is added for classes that do not have a default constructor;
// and for all structs.
if (c.ClassType == ClassType.Class && !l.Exists(m => m.IsConstructor)) {

20
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IClass.cs

@ -143,14 +143,6 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -143,14 +143,6 @@ namespace ICSharpCode.SharpDevelop.Dom
set;
}
///// <summary>
///// Creates a shallow copy of the class that is not frozen.
///// </summary>
//IClass Unfreeze();
}
public interface IClass2 : IClass
{
/// <summary>
/// Gets whether a default constructor should be added to this class if it is required.
/// Such automatic default constructors will not appear in IClass.Methods, but will be present
@ -162,16 +154,4 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -162,16 +154,4 @@ namespace ICSharpCode.SharpDevelop.Dom
get;
}
}
public static class Class2Compatibility
{
public static bool GetAddDefaultConstructorIfRequired(this IClass c)
{
IClass2 c2 = c as IClass2;
if (c2 != null)
return c2.AddDefaultConstructorIfRequired;
else
return false;
}
}
}

Loading…
Cancel
Save