Merge pull request #2387 from icsharpcode/search-predicates

Search predicates

ILSpy/Commands/CopyFullyQualifiedNameContextMenuEntry.cs

@@ -1,9 +1,22 @@
-using System;
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
+// 
+// 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.Windows;
 
-using ICSharpCode.Decompiler;
-using ICSharpCode.Decompiler.Metadata;
-using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.Properties;
 using ICSharpCode.ILSpy.TreeNodes;
 

ILSpy/Commands/ScopeSearchToAssembly.cs

@@ -0,0 +1,82 @@
+// Copyright (c) 2021 Siegfried Pammer
+// 
+// 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 ICSharpCode.Decompiler.TypeSystem;
+using ICSharpCode.ILSpy.Properties;
+using ICSharpCode.ILSpy.TreeNodes;
+
+namespace ICSharpCode.ILSpy
+{
+	[ExportContextMenuEntry(Header = nameof(Resources.ScopeSearchToThisAssembly), Category = nameof(Resources.Analyze), Order = 9999)]
+	public class ScopeSearchToAssembly : IContextMenuEntry
+	{
+		public void Execute(TextViewContext context)
+		{
+			string asmName = GetAssembly(context);
+			string searchTerm = MainWindow.Instance.SearchPane.SearchTerm;
+			string[] args = NativeMethods.CommandLineToArgumentArray(searchTerm);
+			bool replaced = false;
+			for (int i = 0; i < args.Length; i++)
+			{
+				if (args[i].StartsWith("inassembly:", StringComparison.OrdinalIgnoreCase))
+				{
+					args[i] = "inassembly:" + asmName;
+					replaced = true;
+					break;
+				}
+			}
+			if (!replaced)
+			{
+				searchTerm += " inassembly:" + asmName;
+			}
+			else
+			{
+				searchTerm = NativeMethods.ArgumentArrayToCommandLine(args);
+			}
+			MainWindow.Instance.SearchPane.SearchTerm = searchTerm;
+		}
+
+		public bool IsEnabled(TextViewContext context)
+		{
+			return GetAssembly(context) != null;
+		}
+
+		public bool IsVisible(TextViewContext context)
+		{
+			return GetAssembly(context) != null;
+		}
+
+		string GetAssembly(TextViewContext context)
+		{
+			if (context.Reference?.Reference is IEntity entity)
+				return entity.ParentModule.AssemblyName;
+			if (context.SelectedTreeNodes?.Length != 1)
+				return null;
+			switch (context.SelectedTreeNodes[0])
+			{
+				case AssemblyTreeNode tn:
+					return tn.LoadedAssembly.ShortName;
+				case IMemberTreeNode member:
+					return member.Member.ParentModule.AssemblyName;
+				default:
+					return null;
+			}
+		}
+	}
+}

ILSpy/Commands/ScopeSearchToNamespace.cs

@@ -0,0 +1,82 @@
+// Copyright (c) 2021 Siegfried Pammer
+// 
+// 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 ICSharpCode.Decompiler.TypeSystem;
+using ICSharpCode.ILSpy.Properties;
+using ICSharpCode.ILSpy.TreeNodes;
+
+namespace ICSharpCode.ILSpy
+{
+	[ExportContextMenuEntry(Header = nameof(Resources.ScopeSearchToThisNamespace), Category = nameof(Resources.Analyze), Order = 9999)]
+	public class ScopeSearchToNamespace : IContextMenuEntry
+	{
+		public void Execute(TextViewContext context)
+		{
+			string ns = GetNamespace(context);
+			string searchTerm = MainWindow.Instance.SearchPane.SearchTerm;
+			string[] args = NativeMethods.CommandLineToArgumentArray(searchTerm);
+			bool replaced = false;
+			for (int i = 0; i < args.Length; i++)
+			{
+				if (args[i].StartsWith("innamespace:", StringComparison.OrdinalIgnoreCase))
+				{
+					args[i] = "innamespace:" + ns;
+					replaced = true;
+					break;
+				}
+			}
+			if (!replaced)
+			{
+				searchTerm += " innamespace:" + ns;
+			}
+			else
+			{
+				searchTerm = NativeMethods.ArgumentArrayToCommandLine(args);
+			}
+			MainWindow.Instance.SearchPane.SearchTerm = searchTerm;
+		}
+
+		public bool IsEnabled(TextViewContext context)
+		{
+			return GetNamespace(context) != null;
+		}
+
+		public bool IsVisible(TextViewContext context)
+		{
+			return GetNamespace(context) != null;
+		}
+
+		string GetNamespace(TextViewContext context)
+		{
+			if (context.Reference?.Reference is IEntity entity)
+				return entity.Namespace;
+			if (context.SelectedTreeNodes?.Length != 1)
+				return null;
+			switch (context.SelectedTreeNodes[0])
+			{
+				case NamespaceTreeNode tn:
+					return tn.Name;
+				case IMemberTreeNode member:
+					return member.Member.Namespace;
+				default:
+					return null;
+			}
+		}
+	}
+}

ILSpy/Properties/Resources.resx

@@ -763,6 +763,12 @@ Do you want to continue?</value>
   <data name="SaveCode" xml:space="preserve">
     <value>Save Code</value>
   </data>
+  <data name="ScopeSearchToThisAssembly" xml:space="preserve">
+    <value>Scope search to this assembly</value>
+  </data>
+  <data name="ScopeSearchToThisNamespace" xml:space="preserve">
+    <value>Scope search to this namespace</value>
+  </data>
   <data name="Search" xml:space="preserve">
     <value>Search...</value>
   </data>

ILSpy/Search/AbstractEntitySearchStrategy.cs

@@ -1,10 +1,25 @@
-using System;
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
+// 
+// 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 System.Collections.Concurrent;
-using System.Text.RegularExpressions;
-using System.Threading;
 using System.Windows.Media;
 
-using ICSharpCode.Decompiler.Metadata;
 using ICSharpCode.ILSpy.TreeNodes;
 
 namespace ICSharpCode.ILSpy.Search
@@ -16,8 +31,9 @@ abstract class AbstractEntitySearchStrategy : AbstractSearchStrategy
 		protected readonly Language language;
 		protected readonly ApiVisibility apiVisibility;
 
-		protected AbstractEntitySearchStrategy(Language language, ApiVisibility apiVisibility, IProducerConsumerCollection<SearchResult> resultQueue, params string[] terms)
-			: base(resultQueue, terms)
+		protected AbstractEntitySearchStrategy(Language language, ApiVisibility apiVisibility,
+			SearchRequest searchRequest, IProducerConsumerCollection<SearchResult> resultQueue)
+			: base(searchRequest, resultQueue)
 		{
 			this.language = language;
 			this.apiVisibility = apiVisibility;
@@ -49,6 +65,31 @@ protected bool CheckVisibility(IEntity entity)
 			return true;
 		}
 
+		protected bool IsInNamespaceOrAssembly(IEntity entity)
+		{
+			if (searchRequest.InAssembly != null)
+			{
+				if (!entity.ParentModule.FullAssemblyName.Contains(searchRequest.InAssembly))
+				{
+					return false;
+				}
+			}
+
+			if (searchRequest.InNamespace != null)
+			{
+				if (searchRequest.InNamespace.Length == 0)
+				{
+					return entity.Namespace.Length == 0;
+				}
+				else if (!entity.Namespace.Contains(searchRequest.InNamespace))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
 		protected void OnFoundResult(IEntity entity)
 		{
 			var result = ResultFromEntity(entity);