-
-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #805 from anatawa12/ndmf-error-report
Migrate to NDMF ErrorReprting API
- Loading branch information
Showing
76 changed files
with
366 additions
and
1,756 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| using Anatawa12.AvatarOptimizer.ErrorReporting; | ||
| using UnityEditor; | ||
| using UnityEngine; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using CustomLocalization4EditorExtension; | ||
| using nadena.dev.ndmf; | ||
| using nadena.dev.ndmf.localization; | ||
| using Debug = System.Diagnostics.Debug; | ||
| using Object = UnityEngine.Object; | ||
|
|
||
| namespace Anatawa12.AvatarOptimizer | ||
| { | ||
| internal static class BuildLog | ||
| { | ||
| public static void LogInfo(string code, params object[] args) => | ||
| ErrorReport.ReportError(new InlineError(ErrorSeverity.Information, code, args)); | ||
|
|
||
| public static void LogWarning(string code, params object[] args) => | ||
| ErrorReport.ReportError(new InlineError(ErrorSeverity.NonFatal, code, args)); | ||
|
|
||
| public static void LogError(string code, params object[] args) => | ||
| ErrorReport.ReportError(new InlineError(ErrorSeverity.Error, code, args)); | ||
| } | ||
|
|
||
| internal class InlineError : SimpleError, IError | ||
| { | ||
| private static Localizer _localizer = new Localizer("en-US", () => | ||
| { | ||
| var localization = CL4EE.GetLocalization(); | ||
| Debug.Assert(localization != null, nameof(localization) + " != null"); | ||
| return localization.LocalizationByIsoCode.Values | ||
| .Select(locale => (locale.LocaleIsoCode, (Func<string, string>)locale.TryGetLocalizedString)) | ||
| .ToList(); | ||
| }); | ||
|
|
||
| private readonly string _key; | ||
|
|
||
| public InlineError(ErrorSeverity errorSeverity, string key, params object[] args) | ||
| { | ||
| Localizer = _localizer; | ||
| Severity = errorSeverity; | ||
| // https://github.com/bdunderscore/ndmf/issues/99 | ||
| // https://github.com/bdunderscore/ndmf/issues/98 | ||
| _key = key; | ||
|
|
||
| DetailsSubst = Array.ConvertAll(args, o => o?.ToString()); | ||
| Flatten(args, _references); | ||
| } | ||
|
|
||
| protected override string DetailsKey => _key; | ||
|
|
||
| private static void Flatten(object arg, List<ObjectReference> list) | ||
| { | ||
| // https://github.com/bdunderscore/ndmf/issues/95 | ||
| // https://github.com/bdunderscore/ndmf/issues/96 | ||
| if (arg is ObjectReference or) | ||
| list.Add(or); | ||
| else if (arg is Object uo) | ||
| list.Add(ObjectRegistry.GetReference(uo)); | ||
| else if (arg is IContextProvider provider) | ||
| Flatten(provider.ProvideContext(), list); | ||
| else if (arg is IEnumerable enumerable) | ||
| foreach (var value in enumerable) | ||
| Flatten(value, list); | ||
| } | ||
|
|
||
| protected override Localizer Localizer { get; } | ||
| public override ErrorSeverity Severity { get; } | ||
| protected override string TitleKey { get; } | ||
|
|
||
| protected override string[] DetailsSubst { get; } | ||
|
|
||
| protected override string[] HintSubst => DetailsSubst; | ||
| } | ||
|
|
||
| internal interface IContextProvider | ||
| { | ||
| object ProvideContext(); | ||
| } | ||
| } |
File renamed without changes.
Oops, something went wrong.