Author: mkrueger
Date: 2007-09-14 08:17:00 -0400 (Fri, 14 Sep 2007)
New Revision: 85797
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/RefactoryCommands.cs
Log:
* MonoDevelop.Ide.Commands/RefactoryCommands.cs: Fixed 82823: Can't go
to class declaration.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-09-14
11:54:09 UTC (rev 85796)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-09-14
12:17:00 UTC (rev 85797)
@@ -1,3 +1,8 @@
+2007-09-14 Mike Krüger <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Commands/RefactoryCommands.cs: Fixed 82823: Can't go
to
+ class declaration.
+
2007-09-12 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs,
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/RefactoryCommands.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/RefactoryCommands.cs
2007-09-14 11:54:09 UTC (rev 85796)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/RefactoryCommands.cs
2007-09-14 12:17:00 UTC (rev 85797)
@@ -92,7 +92,7 @@
ILanguageItem item =
ctx.ResolveIdentifier (id, line, column, editor.Name, null);
ILanguageItem eitem =
ctx.GetEnclosingLanguageItem (line, column, editor);
- if (item != null && eitem != null &&
eitem.Name == item.Name) {
+ if (item != null && eitem != null &&
eitem.Name == item.Name && !(eitem is IProperty) && !(eitem is IMethod)) {
// If this occurs, then @item
is the base-class version of @eitem
// in which case we don't want
to show the base-class @item, we'd
// rather show the item the
user /actually/ requested, @eitem.
@@ -196,7 +196,6 @@
string itemName = EscapeName (item.Name);
bool canRename = false;
string txt;
-
if (IdeApp.ProjectOperations.CanJumpToDeclaration
(item))
ciset.CommandInfos.Add
(GettextCatalog.GetString ("_Go to declaration"), new RefactoryOperation
(refactorer.GoToDeclaration));
@@ -218,7 +217,7 @@
// Defer adding this item for Classes until
later
ciset.CommandInfos.Add
(GettextCatalog.GetString ("_Rename"), new RefactoryOperation
(refactorer.Rename));
}
-
+
if (item is IClass) {
IClass cls = (IClass) item;
@@ -304,8 +303,9 @@
LocalVariable var = (LocalVariable) item;
AddRefactoryMenuForClass (ctx, pinfo, ciset,
var.ReturnType.FullyQualifiedName);
txt = GettextCatalog.GetString ("Variable
<b>{0}</b>", itemName);
- } else
+ } else {
return null;
+ }
ciset.Text = txt;
ciset.UseMarkup = true;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
