Skip to content

Commit edb69b8

Browse files
committed
修复 global 的匹配
1 parent 61a3cfa commit edb69b8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/DotNetCampus.CommandLine.Analyzer/Generators/InterceptorGenerator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
1616
var analyzerConfigOptionsProvider = context.AnalyzerConfigOptionsProvider;
1717
var commandLineAsProvider = context.SelectCommandLineAsProvider();
1818
var commandRunnerAddHandlerProvider = context.SelectCommandBuilderAddHandlerProvider();
19-
var commandRunnerAddHandlerCoreActionProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "System.Action<T>");
20-
var commandRunnerAddHandlerAsyncActionProvider = context.SelectCommandBuilderAddHandlerProvider("IAsyncCommandRunnerBuilder", "System.Action<T>");
21-
var commandRunnerAddHandlerCoreFuncIntProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "System.Func<T, int>");
22-
var commandRunnerAddHandlerAsyncFuncIntProvider = context.SelectCommandBuilderAddHandlerProvider("IAsyncCommandRunnerBuilder", "System.Func<T, int>");
23-
var commandRunnerAddHandlerCoreFuncTaskProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "System.Func<T, System.Threading.Tasks.Task>");
24-
var commandRunnerAddHandlerCoreFuncTaskIntProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "System.Func<T, System.Threading.Tasks.Task<int>>");
19+
var commandRunnerAddHandlerCoreActionProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "global::System.Action<T>");
20+
var commandRunnerAddHandlerAsyncActionProvider = context.SelectCommandBuilderAddHandlerProvider("IAsyncCommandRunnerBuilder", "global::System.Action<T>");
21+
var commandRunnerAddHandlerCoreFuncIntProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "global::System.Func<T, int>");
22+
var commandRunnerAddHandlerAsyncFuncIntProvider = context.SelectCommandBuilderAddHandlerProvider("IAsyncCommandRunnerBuilder", "global::System.Func<T, int>");
23+
var commandRunnerAddHandlerCoreFuncTaskProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "global::System.Func<T, global::System.Threading.Tasks.Task>");
24+
var commandRunnerAddHandlerCoreFuncTaskIntProvider = context.SelectCommandBuilderAddHandlerProvider("ICoreCommandRunnerBuilder", "global::System.Func<T, global::System.Threading.Tasks.Task<int>>");
2525

2626
context.RegisterSourceOutput(commandLineAsProvider.Collect().Combine(analyzerConfigOptionsProvider), CommandLineAs);
2727
context.RegisterSourceOutput(commandRunnerAddHandlerProvider.Collect().Combine(analyzerConfigOptionsProvider), CommandRunnerAddHandler);

src/DotNetCampus.CommandLine.Analyzer/Generators/ModelProviding/InterceptorModelProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static IncrementalValuesProvider<InterceptorGeneratingModel> SelectComman
2727
{
2828
return SelectMethodInvocationProvider(context,
2929
$"DotNetCampus.Cli.{extensionMethodThisTypeName}", "AddHandler",
30-
"global::" + parameterTypeFullName.Replace(".", @"\.").Replace("<T>", @"<[\w_\.]+>").Replace("T,", @"[\w_\.]+,"));
30+
parameterTypeFullName.Replace(".", @"\.").Replace("<T>", @"<[\w_\.:\?]+>").Replace("<T,", @"<[\w_\.:\?]+,"));
3131
}
3232

3333
public static IncrementalValuesProvider<InterceptorGeneratingModel> SelectMethodInvocationProvider(this IncrementalGeneratorInitializationContext context,

0 commit comments

Comments
 (0)