Skip to content

Commit 655de47

Browse files
Remove FileMatchPattern delegate and replace with System.Func
This was only added because I initially thought it would read better, but it also obscures the in and out types. Since there's no functional difference, I removed it again just to reduce the amount of custom code.
1 parent 41d6bda commit 655de47

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

source/AndroidResolver/AndroidResolver.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<Compile Include="src\CommandLine.cs" />
6060
<Compile Include="src\CommandLineDialog.cs" />
6161
<Compile Include="src\EmbeddedResource.cs" />
62-
<Compile Include="src\FileMatchPattern.cs" />
6362
<Compile Include="src\GradleResolver.cs" />
6463
<Compile Include="src\GradleTemplateResolver.cs" />
6564
<Compile Include="src\GradleWrapper.cs" />

source/AndroidResolver/src/FileMatchPattern.cs

-3
This file was deleted.

source/AndroidResolver/src/PlayServicesResolver.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ internal static void Log(string message, Google.LogLevel level = LogLevel.Info)
10731073
/// <summary>
10741074
/// Patterns of files that are monitored to trigger auto resolution.
10751075
/// </summary>
1076-
private static HashSet<FileMatchPattern> autoResolveFilePatterns = new HashSet<FileMatchPattern>();
1076+
private static HashSet<Func<string, bool>> autoResolveFilePatterns = new HashSet<Func<string, bool>>();
10771077

10781078
/// <summary>
10791079
/// Add file patterns to monitor to trigger auto resolution.
@@ -1082,7 +1082,7 @@ internal static void Log(string message, Google.LogLevel level = LogLevel.Info)
10821082
/// resolution.</param>
10831083
public static void AddAutoResolutionFilePatterns(IEnumerable<Regex> patterns) {
10841084
// Only regex patterns are supported in the public API, but a more performant default is used internally.
1085-
autoResolveFilePatterns.UnionWith(patterns.Select<Regex, FileMatchPattern>(p => p.IsMatch));
1085+
autoResolveFilePatterns.UnionWith(patterns.Select<Regex, Func<string, bool>>(p => p.IsMatch));
10861086
}
10871087

10881088
/// <summary>

0 commit comments

Comments
 (0)