diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2013-08-08 13:48:56 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2013-08-08 13:48:56 +0400 |
commit | 3ae2fb918f053aca258fb77c4532beb7738879da (patch) | |
tree | 1ea1cada2a69e0ac24e163f376ef5f905294fc40 /main | |
parent | c7ca7c07b10a45c0aff4d5fd288628e513aa9a88 (diff) |
[Refactoring] Added find member overloads command.
Diffstat (limited to 'main')
4 files changed, 76 insertions, 18 deletions
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 0e9b1ddc5b..fb3cf0a709 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -136,6 +136,7 @@ <Compile Include="MonoDevelop.CodeActions\IScriptProvider.cs" /> <Compile Include="AddinInfo.cs" /> <Compile Include="MonoDevelop.Refactoring\FindDerivedSymbolsHandler.cs" /> + <Compile Include="MonoDevelop.Refactoring\FindMemberOverloadsHandler.cs" /> </ItemGroup> <ItemGroup> <Folder Include="MonoDevelop.Refactoring\" /> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs index 3ae17e15e9..85fabc877d 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs @@ -24,24 +24,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using MonoDevelop.Core; -using MonoDevelop.Ide.Gui; -using MonoDevelop.Components.Commands; -using MonoDevelop.Ide.Gui.Content; -using MonoDevelop.Refactoring; using MonoDevelop.Ide; using ICSharpCode.NRefactory.TypeSystem; -using MonoDevelop.Ide.TypeSystem; -using System.Collections.Generic; -using System.Threading; -using MonoDevelop.Projects; using MonoDevelop.Ide.FindInFiles; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using System.Linq; using Mono.TextEditor; -using ICSharpCode.NRefactory.Semantics; -using System.Threading.Tasks; using ICSharpCode.NRefactory.Analysis; namespace MonoDevelop.Refactoring diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs new file mode 100644 index 0000000000..d5d504986c --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs @@ -0,0 +1,64 @@ +// +// FindMemberOverloadsHandler.cs +// +// Author: +// Mike Krüger <mkrueger@xamarin.com> +// +// Copyright (c) 2013 Xamarin +// +// 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 MonoDevelop.Ide; +using ICSharpCode.NRefactory.TypeSystem; +using MonoDevelop.Ide.FindInFiles; +using Mono.TextEditor; +using ICSharpCode.NRefactory.Analysis; + +namespace MonoDevelop.Refactoring +{ + public class FindMemberOverloadsHandler + { + Ide.Gui.Document doc; + IMember entity; + + public FindMemberOverloadsHandler (Ide.Gui.Document doc, IMember entity) + { + this.doc = doc; + this.entity = entity; + } + + public void Run () + { + using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) { + foreach (var overloadedMember in entity.DeclaringType.GetMembers (m => m.Name == entity.Name && m.SymbolKind == entity.SymbolKind)) { + var tf = TextFileProvider.Instance.GetReadOnlyTextEditorData (overloadedMember.Region.FileName); + var start = tf.LocationToOffset (overloadedMember.Region.Begin); + tf.SearchRequest.SearchPattern = overloadedMember.Name; + var sr = tf.SearchForward (start); + if (sr != null) { + start = sr.Offset; + } + + monitor.ReportResult (new MemberReference (overloadedMember, overloadedMember.Region, start, overloadedMember.Name.Length)); + } + } + } + } +} + diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs index 271bdae4e8..52e17e950b 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs @@ -305,7 +305,7 @@ namespace MonoDevelop.Refactoring var type = item as IType; if (type != null && type.GetDefinition ().Parts.Count > 1) { var declSet = new CommandInfoSet (); - declSet.Text = GettextCatalog.GetString ("_Go to declaration"); + declSet.Text = GettextCatalog.GetString ("_Go to Declaration"); var ct = type.GetDefinition (); foreach (var part in ct.Parts) declSet.CommandInfos.Add (string.Format (GettextCatalog.GetString ("{0}, Line {1}"), FormatFileName (part.Region.FileName), part.Region.BeginLine), new System.Action (new JumpTo (part).Run)); @@ -319,7 +319,7 @@ namespace MonoDevelop.Refactoring if (item is IMember) { var member = (IMember)item; if (member.IsOverride || member.ImplementedInterfaceMembers.Any ()) { - ainfo.Add (GettextCatalog.GetString ("Go to _base symbol"), new System.Action (new GotoBase (member).Run)); + ainfo.Add (GettextCatalog.GetString ("Go to _Base Symbol"), new System.Action (new GotoBase (member).Run)); added = true; } } @@ -334,7 +334,14 @@ namespace MonoDevelop.Refactoring if (item is IMember) { var member = (IMember)item; if (member.IsVirtual || member.IsAbstract || member.DeclaringType.Kind == TypeKind.Interface) { - ainfo.Add (GettextCatalog.GetString ("Find derived symbols"), new System.Action (new FindDerivedSymbolsHandler (doc, member).Run)); + ainfo.Add (GettextCatalog.GetString ("Find Derived Symbols"), new System.Action (new FindDerivedSymbolsHandler (doc, member).Run)); + added = true; + } + } + if (item is IMember) { + var member = (IMember)item; + if (member.SymbolKind == SymbolKind.Method || member.SymbolKind == SymbolKind.Indexer) { + ainfo.Add (GettextCatalog.GetString ("Find Member Overloads"), new System.Action (new FindMemberOverloadsHandler (doc, member).Run)); added = true; } } @@ -345,7 +352,7 @@ namespace MonoDevelop.Refactoring ITypeDefinition cls = (ITypeDefinition)item; foreach (var bc in cls.DirectBaseTypes) { if (bc != null && bc.GetDefinition () != null && bc.GetDefinition ().Kind != TypeKind.Interface/* TODO: && IdeApp.ProjectOperations.CanJumpToDeclaration (bc)*/) { - ainfo.Add (GettextCatalog.GetString ("Go to _base"), new System.Action (new GotoBase ((ITypeDefinition)item).Run)); + ainfo.Add (GettextCatalog.GetString ("Go to _Base"), new System.Action (new GotoBase ((ITypeDefinition)item).Run)); break; } } |