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

Forum-13925: allow turning off the parameter list in ambience. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2396 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
2c3133639a
commit
ff3c0cbdfa
11 changed files with 273 additions and 204 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooAmbience.cs
  2. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs
  3. 2
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs
  4. 5
      src/Main/Base/Project/Src/Services/AmbienceService/AmbienceReflectionDecorator.cs
  5. 46
      src/Main/Base/Project/Src/Services/AmbienceService/NetAmbience.cs
  6. 7
      src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
  7. 10
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs
  8. 2
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/InsightWindow/MethodInsightDataProvider.cs
  9. 108
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Ambience.cs
  10. 50
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CSharp/CSharpAmbience.cs
  11. 52
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetAmbience.cs

39
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooAmbience.cs
Unescape View File

@ -98,7 +98,7 @@ namespace Grunwald.BooBinding
return (modifier & query) == query; return (modifier & query) == query;
} }
public override string Convert(ModifierEnum modifier) string ConvertAccessibility(ModifierEnum modifier)
{ {
if (ShowAccessibility) { if (ShowAccessibility) {
if (ModifierIsSet(modifier, ModifierEnum.Public)) { if (ModifierIsSet(modifier, ModifierEnum.Public)) {
@ -143,7 +143,7 @@ namespace Grunwald.BooBinding
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(c.Modifiers)); builder.Append(ConvertAccessibility(c.Modifiers));
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
@ -170,7 +170,7 @@ namespace Grunwald.BooBinding
builder.Append("</i>"); builder.Append("</i>");
} }
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
switch (c.ClassType) { switch (c.ClassType) {
case ClassType.Delegate: case ClassType.Delegate:
builder.Append("callable"); builder.Append("callable");
@ -205,7 +205,7 @@ namespace Grunwald.BooBinding
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("</b>"); builder.Append("</b>");
} }
if (c.TypeParameters.Count > 0) { if (ShowTypeParameterList && c.TypeParameters.Count > 0) {
builder.Append("[of "); builder.Append("[of ");
for (int i = 0; i < c.TypeParameters.Count; ++i) { for (int i = 0; i < c.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -214,7 +214,7 @@ namespace Grunwald.BooBinding
builder.Append(']'); builder.Append(']');
} }
if (ShowReturnType && c.ClassType == ClassType.Delegate) { if (ShowParameterList && c.ClassType == ClassType.Delegate) {
builder.Append(" ("); builder.Append(" (");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -231,7 +231,8 @@ namespace Grunwald.BooBinding
} }
} }
builder.Append(')'); builder.Append(')');
}
if (ShowReturnType && c.ClassType == ClassType.Delegate) {
foreach(IMethod m in c.Methods) { foreach(IMethod m in c.Methods) {
if (m.Name != "Invoke") continue; if (m.Name != "Invoke") continue;
@ -239,7 +240,7 @@ namespace Grunwald.BooBinding
builder.Append(Convert(m.ReturnType)); builder.Append(Convert(m.ReturnType));
} }
} else if (ShowInheritanceList) { } else if (ShowInheritanceList && c.ClassType != ClassType.Delegate) {
if (c.BaseTypes.Count > 0) { if (c.BaseTypes.Count > 0) {
builder.Append("("); builder.Append("(");
for (int i = 0; i < c.BaseTypes.Count; ++i) { for (int i = 0; i < c.BaseTypes.Count; ++i) {
@ -252,7 +253,7 @@ namespace Grunwald.BooBinding
} }
} }
if (IncludeBodies) { if (IncludeBody) {
builder.Append(":\n"); builder.Append(":\n");
} }
@ -268,7 +269,7 @@ namespace Grunwald.BooBinding
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(field.Modifiers)); builder.Append(ConvertAccessibility(field.Modifiers));
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
@ -316,7 +317,7 @@ namespace Grunwald.BooBinding
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(property.Modifiers)); builder.Append(ConvertAccessibility(property.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(property)); builder.Append(GetModifier(property));
@ -346,7 +347,7 @@ namespace Grunwald.BooBinding
} }
} }
if (property.Parameters.Count > 0) { if (ShowParameterList && property.Parameters.Count > 0) {
builder.Append('['); builder.Append('[');
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -367,7 +368,7 @@ namespace Grunwald.BooBinding
builder.Append(Convert(property.ReturnType)); builder.Append(Convert(property.ReturnType));
} }
if (IncludeBodies) { if (IncludeBody) {
builder.Append(":"); builder.Append(":");
if (property.CanGet) { if (property.CanGet) {
@ -385,13 +386,15 @@ namespace Grunwald.BooBinding
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(e.Modifiers)); builder.Append(ConvertAccessibility(e.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(e)); builder.Append(GetModifier(e));
} }
if (ShowDefinitionKeyWord) {
builder.Append("event "); builder.Append("event ");
}
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<b>"); builder.Append("<b>");
@ -422,13 +425,15 @@ namespace Grunwald.BooBinding
builder.Append("[Extension] "); builder.Append("[Extension] ");
} }
builder.Append(Convert(m.Modifiers)); builder.Append(ConvertAccessibility(m.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(m)); builder.Append(GetModifier(m));
} }
if (ShowDefinitionKeyWord) {
builder.Append("def "); builder.Append("def ");
}
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<b>"); builder.Append("<b>");
@ -448,7 +453,7 @@ namespace Grunwald.BooBinding
builder.Append("</b>"); builder.Append("</b>");
} }
if (m.TypeParameters.Count > 0) { if (ShowTypeParameterList && m.TypeParameters.Count > 0) {
builder.Append("[of "); builder.Append("[of ");
for (int i = 0; i < m.TypeParameters.Count; ++i) { for (int i = 0; i < m.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -457,6 +462,7 @@ namespace Grunwald.BooBinding
builder.Append(']'); builder.Append(']');
} }
if (ShowParameterList) {
builder.Append("("); builder.Append("(");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -470,6 +476,7 @@ namespace Grunwald.BooBinding
} }
builder.Append(')'); builder.Append(')');
}
if (m.ReturnType != null && ShowReturnType) { if (m.ReturnType != null && ShowReturnType) {
builder.Append(" as "); builder.Append(" as ");
@ -519,7 +526,7 @@ namespace Grunwald.BooBinding
if (fullName != null && typeConversionTable.ContainsKey(fullName)) { if (fullName != null && typeConversionTable.ContainsKey(fullName)) {
builder.Append(typeConversionTable[fullName].ToString()); builder.Append(typeConversionTable[fullName].ToString());
} else { } else {
if (UseFullyQualifiedNames) { if (UseFullyQualifiedTypeNames) {
builder.Append(fullName); builder.Append(fullName);
} else { } else {
builder.Append(returnType.Name); builder.Append(returnType.Name);

2
src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs
Unescape View File

@ -136,7 +136,7 @@ namespace CSharpBinding
if (CodeGenerator.CanUseShortTypeName(rr.ResolvedType, context)) if (CodeGenerator.CanUseShortTypeName(rr.ResolvedType, context))
CSharpAmbience.Instance.ConversionFlags = ConversionFlags.None; CSharpAmbience.Instance.ConversionFlags = ConversionFlags.None;
else else
CSharpAmbience.Instance.ConversionFlags = ConversionFlags.UseFullyQualifiedNames; CSharpAmbience.Instance.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames;
string typeName = CSharpAmbience.Instance.Convert(rr.ResolvedType); string typeName = CSharpAmbience.Instance.Convert(rr.ResolvedType);
editor.Document.Replace(curLine.Offset + typeToken.col - 1, 1, typeName); editor.Document.Replace(curLine.Offset + typeToken.col - 1, 1, typeName);
editor.ActiveTextAreaControl.Caret.Column += typeName.Length - 1; editor.ActiveTextAreaControl.Caret.Column += typeName.Length - 1;

2
src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs
Unescape View File

@ -133,7 +133,7 @@ namespace VBNetBinding
if (CodeGenerator.CanUseShortTypeName(rr.ResolvedType, context)) if (CodeGenerator.CanUseShortTypeName(rr.ResolvedType, context))
VBNetAmbience.Instance.ConversionFlags = ConversionFlags.None; VBNetAmbience.Instance.ConversionFlags = ConversionFlags.None;
else else
VBNetAmbience.Instance.ConversionFlags = ConversionFlags.UseFullyQualifiedNames; VBNetAmbience.Instance.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames;
string typeName = VBNetAmbience.Instance.Convert(rr.ResolvedType); string typeName = VBNetAmbience.Instance.Convert(rr.ResolvedType);
editor.Document.Replace(curLine.Offset + t1.col - 1, 1, typeName); editor.Document.Replace(curLine.Offset + t1.col - 1, 1, typeName);
editor.ActiveTextAreaControl.Caret.Column += typeName.Length - 1; editor.ActiveTextAreaControl.Caret.Column += typeName.Length - 1;

5
src/Main/Base/Project/Src/Services/AmbienceService/AmbienceReflectionDecorator.cs
Unescape View File

@ -26,11 +26,6 @@ namespace ICSharpCode.SharpDevelop
} }
} }
public string Convert(ModifierEnum modifier)
{
return conv.Convert(modifier);
}
public string Convert(IClass c) public string Convert(IClass c)
{ {
return conv.Convert(c); return conv.Convert(c);

46
src/Main/Base/Project/Src/Services/AmbienceService/NetAmbience.cs
Unescape View File

@ -14,16 +14,11 @@ namespace ICSharpCode.SharpDevelop
{ {
public class NetAmbience : AbstractAmbience public class NetAmbience : AbstractAmbience
{ {
public override string Convert(ModifierEnum modifier)
{
return "";
}
public override string Convert(IClass c) public override string Convert(IClass c)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
switch (c.ClassType) { switch (c.ClassType) {
case ClassType.Delegate: case ClassType.Delegate:
builder.Append("Delegate"); builder.Append("Delegate");
@ -47,12 +42,12 @@ namespace ICSharpCode.SharpDevelop
builder.Append(' '); builder.Append(' ');
} }
if (UseFullyQualifiedNames) { if (UseFullyQualifiedMemberNames) {
builder.Append(c.FullyQualifiedName); builder.Append(c.FullyQualifiedName);
} else { } else {
builder.Append(c.Name); builder.Append(c.Name);
} }
if (c.TypeParameters.Count > 0) { if (ShowTypeParameterList && c.TypeParameters.Count > 0) {
builder.Append('<'); builder.Append('<');
for (int i = 0; i < c.TypeParameters.Count; ++i) { for (int i = 0; i < c.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -61,7 +56,7 @@ namespace ICSharpCode.SharpDevelop
builder.Append('>'); builder.Append('>');
} }
if (c.ClassType == ClassType.Delegate) { if (ShowParameterList && c.ClassType == ClassType.Delegate) {
builder.Append('('); builder.Append('(');
foreach (IMethod m in c.Methods) { foreach (IMethod m in c.Methods) {
@ -92,7 +87,7 @@ namespace ICSharpCode.SharpDevelop
} }
} }
if (IncludeBodies) { if (IncludeBody) {
builder.Append("\n{"); builder.Append("\n{");
} }
@ -107,12 +102,12 @@ namespace ICSharpCode.SharpDevelop
public override string Convert(IField field) public override string Convert(IField field)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
builder.Append("Field"); builder.Append("Field");
builder.Append(' '); builder.Append(' ');
} }
if (UseFullyQualifiedNames) { if (UseFullyQualifiedMemberNames) {
builder.Append(field.FullyQualifiedName); builder.Append(field.FullyQualifiedName);
} else { } else {
builder.Append(field.Name); builder.Append(field.Name);
@ -129,19 +124,20 @@ namespace ICSharpCode.SharpDevelop
public override string Convert(IProperty property) public override string Convert(IProperty property)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
if (property.IsIndexer) if (property.IsIndexer)
builder.Append("Indexer "); builder.Append("Indexer ");
else else
builder.Append("Property "); builder.Append("Property ");
} }
if (UseFullyQualifiedNames) { if (UseFullyQualifiedMemberNames) {
builder.Append(property.FullyQualifiedName); builder.Append(property.FullyQualifiedName);
} else { } else {
builder.Append(property.Name); builder.Append(property.Name);
} }
if (ShowParameterList) {
if (property.Parameters.Count > 0) builder.Append('('); if (property.Parameters.Count > 0) builder.Append('(');
for (int i = 0; i < property.Parameters.Count; ++i) { for (int i = 0; i < property.Parameters.Count; ++i) {
@ -152,7 +148,7 @@ namespace ICSharpCode.SharpDevelop
} }
if (property.Parameters.Count > 0) builder.Append(')'); if (property.Parameters.Count > 0) builder.Append(')');
}
if (property.ReturnType != null && ShowReturnType) { if (property.ReturnType != null && ShowReturnType) {
builder.Append(" : "); builder.Append(" : ");
@ -164,11 +160,11 @@ namespace ICSharpCode.SharpDevelop
public override string Convert(IEvent e) public override string Convert(IEvent e)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
builder.Append("Event "); builder.Append("Event ");
} }
if (UseFullyQualifiedNames) { if (UseFullyQualifiedMemberNames) {
builder.Append(e.FullyQualifiedName); builder.Append(e.FullyQualifiedName);
} else { } else {
builder.Append(e.Name); builder.Append(e.Name);
@ -183,19 +179,19 @@ namespace ICSharpCode.SharpDevelop
public override string Convert(IMethod m) public override string Convert(IMethod m)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
if (m.IsExtensionMethod) { if (ShowModifiers && m.IsExtensionMethod) {
builder.Append("[Extension] "); builder.Append("[Extension] ");
} }
builder.Append("Method "); builder.Append("Method ");
} }
if (UseFullyQualifiedNames) { if (UseFullyQualifiedMemberNames) {
builder.Append(m.FullyQualifiedName); builder.Append(m.FullyQualifiedName);
} else { } else {
builder.Append(m.Name); builder.Append(m.Name);
} }
if (m.TypeParameters.Count > 0) { if (ShowTypeParameterList && m.TypeParameters.Count > 0) {
builder.Append('<'); builder.Append('<');
for (int i = 0; i < m.TypeParameters.Count; ++i) { for (int i = 0; i < m.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -203,6 +199,7 @@ namespace ICSharpCode.SharpDevelop
} }
builder.Append('>'); builder.Append('>');
} }
if (ShowParameterList) {
builder.Append('('); builder.Append('(');
for (int i = 0; i < m.Parameters.Count; ++i) { for (int i = 0; i < m.Parameters.Count; ++i) {
builder.Append(Convert(m.Parameters[i])); builder.Append(Convert(m.Parameters[i]));
@ -210,14 +207,15 @@ namespace ICSharpCode.SharpDevelop
builder.Append(", "); builder.Append(", ");
} }
} }
builder.Append(")"); builder.Append(")");
}
if (m.ReturnType != null && ShowReturnType) { if (m.ReturnType != null && ShowReturnType) {
builder.Append(" : "); builder.Append(" : ");
builder.Append(Convert(m.ReturnType)); builder.Append(Convert(m.ReturnType));
} }
if (IncludeBodies) { if (IncludeBody) {
builder.Append(" {"); builder.Append(" {");
} }
@ -237,7 +235,7 @@ namespace ICSharpCode.SharpDevelop
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
string name = returnType.DotNetName; string name = returnType.DotNetName;
if (UseFullyQualifiedNames) { if (UseFullyQualifiedTypeNames) {
builder.Append(name); builder.Append(name);
} else { } else {
int pos = returnType.Namespace.Length; int pos = returnType.Namespace.Length;

7
src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
Unescape View File

@ -403,14 +403,13 @@ namespace ICSharpCode.SharpDevelop.Debugging
if (result is MixedResolveResult) if (result is MixedResolveResult)
return GetText(((MixedResolveResult)result).PrimaryResult, expression, out debuggerCanShowValue); return GetText(((MixedResolveResult)result).PrimaryResult, expression, out debuggerCanShowValue);
IAmbience ambience = AmbienceService.CurrentAmbience; IAmbience ambience = AmbienceService.CurrentAmbience;
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowAccessibility; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.UseFullyQualifiedMemberNames;
if (result is MemberResolveResult) { if (result is MemberResolveResult) {
return GetMemberText(ambience, ((MemberResolveResult)result).ResolvedMember, expression, out debuggerCanShowValue); return GetMemberText(ambience, ((MemberResolveResult)result).ResolvedMember, expression, out debuggerCanShowValue);
} else if (result is LocalResolveResult) { } else if (result is LocalResolveResult) {
LocalResolveResult rr = (LocalResolveResult)result; LocalResolveResult rr = (LocalResolveResult)result;
ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedNames ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedTypeNames
| ConversionFlags.ShowReturnType | ConversionFlags.ShowReturnType | ConversionFlags.ShowDefinitionKeyWord;
| ConversionFlags.QualifiedNamesOnlyForReturnTypes;
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
if (rr.IsParameter) if (rr.IsParameter)
b.Append("parameter "); b.Append("parameter ");

10
src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs
Unescape View File

@ -130,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
imageIndex = ClassBrowserIconService.GetIcon(c); imageIndex = ClassBrowserIconService.GetIcon(c);
ambience.ConversionFlags = ConversionFlags.None; ambience.ConversionFlags = ConversionFlags.None;
text = ambience.Convert(c); text = ambience.Convert(c);
ambience.ConversionFlags = ConversionFlags.UseFullyQualifiedNames | ConversionFlags.ShowReturnType | ConversionFlags.ShowModifiers; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.UseFullyQualifiedMemberNames;
description = ambience.Convert(c); description = ambience.Convert(c);
documentation = c.Documentation; documentation = c.Documentation;
GetPriority(c.DotNetName); GetPriority(c.DotNetName);
@ -140,7 +140,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{ {
member = method; member = method;
ambience = AmbienceService.CurrentAmbience; ambience = AmbienceService.CurrentAmbience;
ambience.ConversionFlags = ConversionFlags.ShowReturnType | ConversionFlags.ShowParameterNames | ConversionFlags.ShowModifiers; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
imageIndex = ClassBrowserIconService.GetIcon(method); imageIndex = ClassBrowserIconService.GetIcon(method);
text = method.Name; text = method.Name;
description = ambience.Convert(method); description = ambience.Convert(method);
@ -152,7 +152,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{ {
member = field; member = field;
ambience = AmbienceService.CurrentAmbience; ambience = AmbienceService.CurrentAmbience;
ambience.ConversionFlags = ConversionFlags.ShowReturnType | ConversionFlags.ShowParameterNames | ConversionFlags.ShowModifiers; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
imageIndex = ClassBrowserIconService.GetIcon(field); imageIndex = ClassBrowserIconService.GetIcon(field);
text = field.Name; text = field.Name;
description = ambience.Convert(field); description = ambience.Convert(field);
@ -164,7 +164,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{ {
member = property; member = property;
ambience = AmbienceService.CurrentAmbience; ambience = AmbienceService.CurrentAmbience;
ambience.ConversionFlags = ConversionFlags.ShowReturnType | ConversionFlags.ShowParameterNames | ConversionFlags.ShowModifiers; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
imageIndex = ClassBrowserIconService.GetIcon(property); imageIndex = ClassBrowserIconService.GetIcon(property);
text = property.Name; text = property.Name;
description = ambience.Convert(property); description = ambience.Convert(property);
@ -176,7 +176,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{ {
member = e; member = e;
ambience = AmbienceService.CurrentAmbience; ambience = AmbienceService.CurrentAmbience;
ambience.ConversionFlags = ConversionFlags.ShowReturnType | ConversionFlags.ShowParameterNames | ConversionFlags.ShowModifiers; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags;
imageIndex = ClassBrowserIconService.GetIcon(e); imageIndex = ClassBrowserIconService.GetIcon(e);
text = e.Name; text = e.Name;
description = ambience.Convert(e); description = ambience.Convert(e);

2
src/Main/Base/Project/Src/TextEditor/Gui/Editor/InsightWindow/MethodInsightDataProvider.cs
Unescape View File

@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{ {
IMember method = methods[number]; IMember method = methods[number];
IAmbience conv = AmbienceService.CurrentAmbience; IAmbience conv = AmbienceService.CurrentAmbience;
conv.ConversionFlags = ConversionFlags.StandardConversionFlags; conv.ConversionFlags = ConversionFlags.StandardConversionFlags| ConversionFlags.UseFullyQualifiedMemberNames;
string documentation = method.Documentation; string documentation = method.Documentation;
string text; string text;
if (method is IMethod) { if (method is IMethod) {

108
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Ambience.cs
Unescape View File

@ -10,29 +10,70 @@ using System;
namespace ICSharpCode.SharpDevelop.Dom namespace ICSharpCode.SharpDevelop.Dom
{ {
[Flags] [Flags]
public enum ConversionFlags { public enum ConversionFlags
{
/// <summary>
/// Convert only the name.
/// </summary>
None = 0, None = 0,
ShowParameterNames = 1, /// <summary>
ShowAccessibility = 16, /// Show the parameter list
UseFullyQualifiedNames = 2, /// </summary>
ShowModifiers = 4, ShowParameterList = 1,
ShowInheritanceList = 8, /// <summary>
IncludeHTMLMarkup = 32, /// Show names for parameters
QualifiedNamesOnlyForReturnTypes = 128, /// </summary>
IncludeBodies = 256, ShowParameterNames = 2,
ShowReturnType = 512, /// <summary>
/// Show the accessibility (private, public, etc.)
/// </summary>
ShowAccessibility = 4,
/// <summary>
/// Show the definition key word (class, struct, Sub, Function, etc.)
/// </summary>
ShowDefinitionKeyWord = 8,
/// <summary>
/// Show the fully qualified name for the member
/// </summary>
UseFullyQualifiedMemberNames = 0x10,
/// <summary>
/// Show modifiers (virtual, override, etc.)
/// </summary>
ShowModifiers = 0x20,
/// <summary>
/// Show the inheritance declaration
/// </summary>
ShowInheritanceList = 0x40,
IncludeHTMLMarkup = 0x80,
/// <summary>
/// Show the return type
/// </summary>
ShowReturnType = 0x100,
/// <summary>
/// Use fully qualified names for return type and parameters.
/// </summary>
UseFullyQualifiedTypeNames = 0x200,
/// <summary>
/// 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.
/// </summary>
IncludeBody = 0x400,
/// <summary>
/// Show the list of type arguments on method and class declarations.
/// Type arguments for parameter/return types are always shown.
/// </summary>
ShowTypeParameterList = 0x800,
StandardConversionFlags = ShowParameterNames | StandardConversionFlags = ShowParameterNames |
UseFullyQualifiedNames |
ShowReturnType |
ShowModifiers,
All = ShowParameterNames |
ShowAccessibility | ShowAccessibility |
UseFullyQualifiedNames | ShowParameterList |
ShowModifiers |
ShowReturnType | ShowReturnType |
ShowInheritanceList, ShowModifiers |
ShowTypeParameterList |
ShowDefinitionKeyWord,
All = 0xfff,
} }
public interface IAmbience public interface IAmbience
@ -42,8 +83,6 @@ namespace ICSharpCode.SharpDevelop.Dom
set; set;
} }
string Convert(ModifierEnum modifier);
string Convert(IClass c); string Convert(IClass c);
string ConvertEnd(IClass c); string ConvertEnd(IClass c);
@ -94,9 +133,21 @@ namespace ICSharpCode.SharpDevelop.Dom
} }
} }
public bool UseFullyQualifiedNames { public bool UseFullyQualifiedTypeNames {
get { get {
return (conversionFlags & ConversionFlags.UseFullyQualifiedNames) == ConversionFlags.UseFullyQualifiedNames; 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;
} }
} }
@ -120,17 +171,22 @@ namespace ICSharpCode.SharpDevelop.Dom
public bool UseFullyQualifiedMemberNames { public bool UseFullyQualifiedMemberNames {
get { get {
return UseFullyQualifiedNames && !((conversionFlags & ConversionFlags.QualifiedNamesOnlyForReturnTypes) == ConversionFlags.QualifiedNamesOnlyForReturnTypes); return (conversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames;
}
}
public bool IncludeBody {
get {
return (conversionFlags & ConversionFlags.IncludeBody) == ConversionFlags.IncludeBody;
} }
} }
public bool IncludeBodies { public bool ShowTypeParameterList {
get { get {
return (conversionFlags & ConversionFlags.IncludeBodies) == ConversionFlags.IncludeBodies; return (conversionFlags & ConversionFlags.ShowTypeParameterList) == ConversionFlags.ShowTypeParameterList;
} }
} }
public abstract string Convert(ModifierEnum modifier);
public abstract string Convert(IClass c); public abstract string Convert(IClass c);
public abstract string ConvertEnd(IClass c); public abstract string ConvertEnd(IClass c);
public abstract string Convert(IField c); public abstract string Convert(IField c);

50
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CSharp/CSharpAmbience.cs
Unescape View File

@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
return (modifier & query) == query; return (modifier & query) == query;
} }
public override string Convert(ModifierEnum modifier) string ConvertAccessibility(ModifierEnum modifier)
{ {
if (ShowAccessibility) { if (ShowAccessibility) {
if (ModifierIsSet(modifier, ModifierEnum.Public)) { if (ModifierIsSet(modifier, ModifierEnum.Public)) {
@ -80,7 +80,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(c.Modifiers)); builder.Append(ConvertAccessibility(c.Modifiers));
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
@ -107,7 +107,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append("</i>"); builder.Append("</i>");
} }
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
switch (c.ClassType) { switch (c.ClassType) {
case ClassType.Delegate: case ClassType.Delegate:
builder.Append("delegate"); builder.Append("delegate");
@ -150,7 +150,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("</b>"); builder.Append("</b>");
} }
if (c.TypeParameters.Count > 0) { if (ShowTypeParameterList && c.TypeParameters.Count > 0) {
builder.Append('<'); builder.Append('<');
for (int i = 0; i < c.TypeParameters.Count; ++i) { for (int i = 0; i < c.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -159,7 +159,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append('>'); builder.Append('>');
} }
if (ShowReturnType && c.ClassType == ClassType.Delegate) { if (ShowParameterList && c.ClassType == ClassType.Delegate) {
builder.Append(" ("); builder.Append(" (");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -189,7 +189,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
} }
} }
if (IncludeBodies) { if (IncludeBody) {
builder.Append("\n{"); builder.Append("\n{");
} }
@ -205,7 +205,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(field.Modifiers)); builder.Append(ConvertAccessibility(field.Modifiers));
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
@ -218,9 +218,15 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append("static "); builder.Append("static ");
} }
if (field.IsNew) {
builder.Append("new ");
}
if (field.IsReadonly) { if (field.IsReadonly) {
builder.Append("readonly "); builder.Append("readonly ");
} }
if ((field.Modifiers & ModifierEnum.Volatile) == ModifierEnum.Volatile) {
builder.Append("volatile ");
}
} }
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
@ -246,7 +252,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append("</b>"); builder.Append("</b>");
} }
if (IncludeBodies) builder.Append(";"); if (IncludeBody) builder.Append(";");
return builder.ToString(); return builder.ToString();
} }
@ -255,7 +261,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(property.Modifiers)); builder.Append(ConvertAccessibility(property.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(property)); builder.Append(GetModifier(property));
@ -267,12 +273,8 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
} }
if (property.IsIndexer) { if (property.IsIndexer) {
if (property.DeclaringType != null) { if (property.DeclaringType != null && UseFullyQualifiedMemberNames) {
if (UseFullyQualifiedMemberNames) {
builder.Append(property.DeclaringType.FullyQualifiedName); builder.Append(property.DeclaringType.FullyQualifiedName);
} else {
builder.Append(property.DeclaringType.Name);
}
builder.Append('.'); builder.Append('.');
} }
builder.Append("this"); builder.Append("this");
@ -290,7 +292,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
} }
} }
if (property.Parameters.Count > 0) { if (property.Parameters.Count > 0 && ShowParameterList) {
builder.Append(property.IsIndexer ? '[' : '('); builder.Append(property.IsIndexer ? '[' : '(');
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -306,7 +308,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append(property.IsIndexer ? ']' : ')'); builder.Append(property.IsIndexer ? ']' : ')');
} }
if (IncludeBodies) { if (IncludeBody) {
builder.Append(" { "); builder.Append(" { ");
if (property.CanGet) { if (property.CanGet) {
@ -326,13 +328,15 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(e.Modifiers)); builder.Append(ConvertAccessibility(e.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(e)); builder.Append(GetModifier(e));
} }
if (ShowDefinitionKeyWord) {
builder.Append("event "); builder.Append("event ");
}
if (e.ReturnType != null && ShowReturnType) { if (e.ReturnType != null && ShowReturnType) {
builder.Append(Convert(e.ReturnType)); builder.Append(Convert(e.ReturnType));
@ -353,7 +357,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append("</b>"); builder.Append("</b>");
} }
if (IncludeBodies) builder.Append(";"); if (IncludeBody) builder.Append(";");
return builder.ToString(); return builder.ToString();
} }
@ -361,7 +365,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
public override string Convert(IMethod m) public override string Convert(IMethod m)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(m.Modifiers)); builder.Append(ConvertAccessibility(m.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(m)); builder.Append(GetModifier(m));
@ -394,7 +398,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append("</b>"); builder.Append("</b>");
} }
if (m.TypeParameters.Count > 0) { if (ShowTypeParameterList && m.TypeParameters.Count > 0) {
builder.Append('<'); builder.Append('<');
for (int i = 0; i < m.TypeParameters.Count; ++i) { for (int i = 0; i < m.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -403,6 +407,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
builder.Append('>'); builder.Append('>');
} }
if (ShowParameterList) {
builder.Append("("); builder.Append("(");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -418,8 +423,9 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
} }
builder.Append(')'); builder.Append(')');
}
if (IncludeBodies) { if (IncludeBody) {
if (m.DeclaringType != null) { if (m.DeclaringType != null) {
if (m.DeclaringType.ClassType == ClassType.Interface) { if (m.DeclaringType.ClassType == ClassType.Interface) {
builder.Append(";"); builder.Append(";");
@ -450,7 +456,7 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
if (fullName != null && TypeConversionTable.TryGetValue(fullName, out shortName)) { if (fullName != null && TypeConversionTable.TryGetValue(fullName, out shortName)) {
builder.Append(shortName); builder.Append(shortName);
} else { } else {
if (UseFullyQualifiedNames) { if (UseFullyQualifiedTypeNames) {
builder.Append(fullName); builder.Append(fullName);
} else { } else {
builder.Append(returnType.Name); builder.Append(returnType.Name);

52
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetAmbience.cs
Unescape View File

@ -39,11 +39,13 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("MustOverride "); builder.Append("MustOverride ");
} else if (decoration.IsSealed) { } else if (decoration.IsSealed) {
builder.Append("NotOverridable "); builder.Append("NotOverridable ");
} else if (decoration.IsVirtual) { }
if (decoration.IsVirtual) {
builder.Append("Overridable "); builder.Append("Overridable ");
} else if (decoration.IsOverride) { } else if (decoration.IsOverride) {
builder.Append("Overrides "); builder.Append("Overrides ");
} else if (decoration.IsNew) { }
if (decoration.IsNew) {
builder.Append("Shadows "); builder.Append("Shadows ");
} }
@ -54,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
return builder.ToString(); return builder.ToString();
} }
public override string Convert(ModifierEnum modifier) string ConvertAccessibility(ModifierEnum modifier)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowAccessibility) { if (ShowAccessibility) {
@ -78,7 +80,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(c.Modifiers)); builder.Append(ConvertAccessibility(c.Modifiers));
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
@ -98,7 +100,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("</i>"); builder.Append("</i>");
} }
if (ShowModifiers) { if (ShowDefinitionKeyWord) {
switch (c.ClassType) { switch (c.ClassType) {
case ClassType.Delegate: case ClassType.Delegate:
builder.Append("Delegate "); builder.Append("Delegate ");
@ -149,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("</b>"); builder.Append("</b>");
} }
if (c.TypeParameters.Count > 0) { if (ShowTypeParameterList && c.TypeParameters.Count > 0) {
builder.Append("(Of "); builder.Append("(Of ");
for (int i = 0; i < c.TypeParameters.Count; ++i) { for (int i = 0; i < c.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -158,7 +160,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append(')'); builder.Append(')');
} }
if (ShowReturnType && c.ClassType == ClassType.Delegate) { if (ShowParameterList && c.ClassType == ClassType.Delegate) {
builder.Append("("); builder.Append("(");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -176,7 +178,8 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
} }
builder.Append(")"); builder.Append(")");
}
if (ShowReturnType && c.ClassType == ClassType.Delegate) {
foreach (IMethod m in c.Methods) { foreach (IMethod m in c.Methods) {
if (m.Name != "Invoke") continue; if (m.Name != "Invoke") continue;
@ -188,8 +191,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
} }
} }
} }
} else if (ShowInheritanceList && c.ClassType != ClassType.Delegate) {
} else if (ShowInheritanceList) {
if (c.BaseTypes.Count > 0) { if (c.BaseTypes.Count > 0) {
builder.Append(" Inherits "); builder.Append(" Inherits ");
for (int i = 0; i < c.BaseTypes.Count; ++i) { for (int i = 0; i < c.BaseTypes.Count; ++i) {
@ -238,7 +240,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(field.Modifiers)); builder.Append(ConvertAccessibility(field.Modifiers));
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
@ -279,11 +281,10 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(property.Modifiers)); builder.Append(ConvertAccessibility(property.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(property)); builder.Append(GetModifier(property));
}
if (property.IsIndexer) { if (property.IsIndexer) {
builder.Append("Default "); builder.Append("Default ");
@ -292,10 +293,14 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
if (property.CanGet && !property.CanSet) { if (property.CanGet && !property.CanSet) {
builder.Append("ReadOnly "); builder.Append("ReadOnly ");
} }
if (property.CanSet && !property.CanGet) { if (property.CanSet && !property.CanGet) {
builder.Append("WriteOnly "); builder.Append("WriteOnly ");
} }
}
if (ShowDefinitionKeyWord) {
builder.Append("Property ");
}
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<b>"); builder.Append("<b>");
@ -311,7 +316,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("</b>"); builder.Append("</b>");
} }
if (property.Parameters.Count > 0) { if (ShowParameterList && property.Parameters.Count > 0) {
builder.Append("("); builder.Append("(");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -339,13 +344,15 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(Convert(e.Modifiers)); builder.Append(ConvertAccessibility(e.Modifiers));
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(e)); builder.Append(GetModifier(e));
} }
if (ShowDefinitionKeyWord) {
builder.Append("Event "); builder.Append("Event ");
}
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<b>"); builder.Append("<b>");
@ -376,12 +383,12 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("<Extension> "); builder.Append("<Extension> ");
} }
builder.Append(Convert(m.Modifiers)); // show visibility builder.Append(ConvertAccessibility(m.Modifiers)); // show visibility
if (ShowModifiers) { if (ShowModifiers) {
builder.Append(GetModifier(m)); builder.Append(GetModifier(m));
} }
if (ShowReturnType) { if (ShowDefinitionKeyWord) {
if (m.ReturnType == null || m.ReturnType.FullyQualifiedName == "System.Void") { if (m.ReturnType == null || m.ReturnType.FullyQualifiedName == "System.Void") {
builder.Append("Sub "); builder.Append("Sub ");
} else { } else {
@ -404,7 +411,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("</b>"); builder.Append("</b>");
} }
if (m.TypeParameters.Count > 0) { if (ShowTypeParameterList && m.TypeParameters.Count > 0) {
builder.Append("(Of "); builder.Append("(Of ");
for (int i = 0; i < m.TypeParameters.Count; ++i) { for (int i = 0; i < m.TypeParameters.Count; ++i) {
if (i > 0) builder.Append(", "); if (i > 0) builder.Append(", ");
@ -413,6 +420,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append(')'); builder.Append(')');
} }
if (ShowParameterList) {
builder.Append("("); builder.Append("(");
if (IncludeHTMLMarkup) builder.Append("<br>"); if (IncludeHTMLMarkup) builder.Append("<br>");
@ -426,6 +434,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
} }
builder.Append(')'); builder.Append(')');
}
if (ShowReturnType && m.ReturnType != null && m.ReturnType.FullyQualifiedName != "System.Void") { if (ShowReturnType && m.ReturnType != null && m.ReturnType.FullyQualifiedName != "System.Void") {
builder.Append(" As "); builder.Append(" As ");
@ -456,7 +465,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
if (fullName != null && TypeConversionTable.TryGetValue(fullName, out shortName)) { if (fullName != null && TypeConversionTable.TryGetValue(fullName, out shortName)) {
builder.Append(shortName); builder.Append(shortName);
} else { } else {
if (UseFullyQualifiedNames) { if (UseFullyQualifiedTypeNames) {
builder.Append(fullName); builder.Append(fullName);
} else { } else {
builder.Append(returnType.Name); builder.Append(returnType.Name);
@ -493,7 +502,6 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
public override string Convert(IParameter param) public override string Convert(IParameter param)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (ShowParameterNames) {
if (IncludeHTMLMarkup) { if (IncludeHTMLMarkup) {
builder.Append("<i>"); builder.Append("<i>");
} }
@ -510,7 +518,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
builder.Append("</i>"); builder.Append("</i>");
} }
if (ShowParameterNames) {
builder.Append(param.Name); builder.Append(param.Name);
builder.Append(" As "); builder.Append(" As ");
} }

Write Preview
Loading…
Cancel
Save