Use one Api

Jack251970 · Jack251970 · commit 81f4889a97e5 · 2025-04-03T19:04:21.000+08:00
diff --git a/Flow.Launcher.Localization.SourceGenerators/Localize/EnumSourceGenerator.cs b/Flow.Launcher.Localization.SourceGenerators/Localize/EnumSourceGenerator.cs
@@ -215,10 +215,8 @@ private void GenerateSource(
             string getTranslation = null;
             if (useDI)
             {
-                sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI? api = null;");
-                sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI Api => api ??= CommunityToolkit.Mvvm.DependencyInjection.Ioc.Default.GetRequiredService<Flow.Launcher.Plugin.IPublicAPI>();");
-                sourceBuilder.AppendLine();
-                getTranslation = "Api.GetTranslation";
+                // Use Api from LocalizeSourceGenerator
+                getTranslation = $"{assemblyNamespace}.{Constants.ClassName}.Api.GetTranslation";
             }
             else if (pluginInfo?.IsValid == true)
             {
diff --git a/Flow.Launcher.Localization.SourceGenerators/Localize/LocalizeSourceGenerator.cs b/Flow.Launcher.Localization.SourceGenerators/Localize/LocalizeSourceGenerator.cs
@@ -499,7 +499,8 @@ private static void GenerateSource(
             if (useDI)
             {
                 sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI? api = null;");
-                sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI Api => api ??= CommunityToolkit.Mvvm.DependencyInjection.Ioc.Default.GetRequiredService<Flow.Launcher.Plugin.IPublicAPI>();");
+                // Internal for EnumSourceGenerator to use
+                sourceBuilder.AppendLine($"{tabString}internal static Flow.Launcher.Plugin.IPublicAPI Api => api ??= CommunityToolkit.Mvvm.DependencyInjection.Ioc.Default.GetRequiredService<Flow.Launcher.Plugin.IPublicAPI>();");
                 sourceBuilder.AppendLine();
                 getTranslation = "Api.GetTranslation";
             }

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,8 @@ private void GenerateSource(`
`215`	`215`	`string getTranslation = null;`
`216`	`216`	`if (useDI)`
`217`	`217`	`{`
`218`		`- sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI? api = null;");`
`219`		`- sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI Api => api ??= CommunityToolkit.Mvvm.DependencyInjection.Ioc.Default.GetRequiredService<Flow.Launcher.Plugin.IPublicAPI>();");`
`220`		`- sourceBuilder.AppendLine();`
`221`		`- getTranslation = "Api.GetTranslation";`
	`218`	`+ // Use Api from LocalizeSourceGenerator`
	`219`	`+ getTranslation = $"{assemblyNamespace}.{Constants.ClassName}.Api.GetTranslation";`
`222`	`220`	`}`
`223`	`221`	`else if (pluginInfo?.IsValid == true)`
`224`	`222`	`{`
Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,8 @@ private static void GenerateSource(`
`499`	`499`	`if (useDI)`
`500`	`500`	`{`
`501`	`501`	`sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI? api = null;");`
`502`		`- sourceBuilder.AppendLine($"{tabString}private static Flow.Launcher.Plugin.IPublicAPI Api => api ??= CommunityToolkit.Mvvm.DependencyInjection.Ioc.Default.GetRequiredService<Flow.Launcher.Plugin.IPublicAPI>();");`
	`502`	`+ // Internal for EnumSourceGenerator to use`
	`503`	`+ sourceBuilder.AppendLine($"{tabString}internal static Flow.Launcher.Plugin.IPublicAPI Api => api ??= CommunityToolkit.Mvvm.DependencyInjection.Ioc.Default.GetRequiredService<Flow.Launcher.Plugin.IPublicAPI>();");`
`503`	`504`	`sourceBuilder.AppendLine();`
`504`	`505`	`getTranslation = "Api.GetTranslation";`
`505`	`506`	`}`