Browse Source

Fixed SD2-411: Code completition doesn't show parent class (nested classes)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@376 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 21 years ago
parent
commit
9ea25bfec5
  1. 17
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/UIService.cs
  2. 14
      src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs
  3. 2
      src/Main/StartUp/Project/Dialogs/ExceptionBox.cs

17
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/UIService.cs

@ -65,28 +65,17 @@ namespace ICSharpCode.FormDesigner.Services
#region Show error functions #region Show error functions
public void ShowError(Exception ex) public void ShowError(Exception ex)
{ {
ShowError(ex, null); MessageService.ShowError(ex);
} }
public void ShowError(string message) public void ShowError(string message)
{ {
ShowError(null, message); MessageService.ShowError(message);
} }
public void ShowError(Exception ex, string message) public void ShowError(Exception ex, string message)
{ {
// string msg = String.Empty; MessageService.ShowError(ex, message);
//
// if (ex != null) {
// msg = "Exception occurred: " + ex.ToString() + "\n";
// }
//
// if (message != null) {
// msg += message;
// }
MessageBox.Show(GetDialogOwnerWindow(), ex.Message, ResourceService.GetString("Global.ErrorText"), MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
#endregion #endregion

14
src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs

@ -928,6 +928,20 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
result.Add(m); result.Add(m);
} }
} }
if (callingClass.DeclaringType != null) {
result.Add(callingClass.DeclaringType);
members.Clear();
t = callingClass.DeclaringType.DefaultReturnType;
members.AddRange(t.GetMethods());
members.AddRange(t.GetFields());
members.AddRange(t.GetEvents());
members.AddRange(t.GetProperties());
foreach (IMember m in members) {
if (m.IsStatic) {
result.Add(m);
}
}
}
} }
foreach (KeyValuePair<string, List<LocalLookupVariable>> pair in lookupTableVisitor.Variables) { foreach (KeyValuePair<string, List<LocalLookupVariable>> pair in lookupTableVisitor.Variables) {
if (pair.Value != null && pair.Value.Count > 0) { if (pair.Value != null && pair.Value.Count > 0) {

2
src/Main/StartUp/Project/Dialogs/ExceptionBox.cs

@ -99,7 +99,7 @@ namespace ICSharpCode.SharpDevelop
} else if (result == 1) { } else if (result == 1) {
// clipboard text is too long to be inserted into the mail-url // clipboard text is too long to be inserted into the mail-url
string url = "mailto:icsharpcode.svn-sharpdevelop-users@glengamoi.com?subject=Bug Report&body=" string url = "mailto:icsharpcode.svn-sharpdevelop-users@glengamoi.com?subject=Bug Report&body="
+ Uri.EscapeDataString("Write an english description of what you were doing when the" + + Uri.EscapeDataString("Write an english description of what you were doing when the " +
"error occured and paste the exception text."); "error occured and paste the exception text.");
try { try {
Process.Start(url); Process.Start(url);

Loading…
Cancel
Save