Repository navigation
chore: Separate editor settings storage from domain values #1581
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,7 @@ | ||
| namespace System.Runtime.CompilerServices | ||
| { | ||
| // Unity's .NET profile does not provide this marker type, but init accessors require it. | ||
| internal static class IsExternalInit | ||
| { | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
19 changes: 8 additions & 11 deletions
19
Packages/src/Editor/Domain/UnityCliLoopEditorSettingsData.cs
This file contains hidden or 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,17 +1,14 @@ | ||
| using System; | ||
|
|
||
| namespace io.github.hatayama.UnityCliLoop.Domain | ||
| { | ||
| [Serializable] | ||
| public record UnityCliLoopEditorSettingsData | ||
| { | ||
| public bool showDeveloperTools = false; | ||
| public string lastSeenSetupWizardVersion = ""; | ||
| public string lastSeenSetupWizardMinimumDispatcherVersion = ""; | ||
| public bool suppressSetupWizardAutoShow = false; | ||
| public bool legacySetupWizardStateMigrated = false; | ||
| public bool showUnityCliLoopSecuritySetting = true; | ||
| public bool showToolSettings = true; | ||
| public bool installSkillsFlat = true; | ||
| public bool showDeveloperTools { get; init; } = false; | ||
| public string lastSeenSetupWizardVersion { get; init; } = ""; | ||
| public string lastSeenSetupWizardMinimumDispatcherVersion { get; init; } = ""; | ||
| public bool suppressSetupWizardAutoShow { get; init; } = false; | ||
| public bool legacySetupWizardStateMigrated { get; init; } = false; | ||
| public bool showUnityCliLoopSecuritySetting { get; init; } = true; | ||
| public bool showToolSettings { get; init; } = true; | ||
| public bool installSkillsFlat { get; init; } = true; | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
Packages/src/Editor/Infrastructure/Settings/UnityCliLoopEditorSettingsJsonData.cs
This file contains hidden or 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,60 @@ | ||
| using System; | ||
| using System.Diagnostics; | ||
|
|
||
| using io.github.hatayama.UnityCliLoop.Domain; | ||
|
|
||
| namespace io.github.hatayama.UnityCliLoop.Infrastructure | ||
| { | ||
| /// <summary> | ||
| /// JsonUtility storage DTO for Unity CLI Loop editor settings. | ||
| /// </summary> | ||
| [Serializable] | ||
| internal sealed class UnityCliLoopEditorSettingsJsonData | ||
| { | ||
| public bool showDeveloperTools = false; | ||
| public string lastSeenSetupWizardVersion = ""; | ||
| public string lastSeenSetupWizardMinimumDispatcherVersion = ""; | ||
| public bool suppressSetupWizardAutoShow = false; | ||
| public bool legacySetupWizardStateMigrated = false; | ||
| public bool showUnityCliLoopSecuritySetting = true; | ||
| public bool showToolSettings = true; | ||
| public bool installSkillsFlat = true; | ||
|
|
||
| internal UnityCliLoopEditorSettingsData ToDomain() | ||
| { | ||
| return new UnityCliLoopEditorSettingsData | ||
| { | ||
| showDeveloperTools = showDeveloperTools, | ||
| lastSeenSetupWizardVersion = lastSeenSetupWizardVersion, | ||
| lastSeenSetupWizardMinimumDispatcherVersion = lastSeenSetupWizardMinimumDispatcherVersion, | ||
| suppressSetupWizardAutoShow = suppressSetupWizardAutoShow, | ||
| legacySetupWizardStateMigrated = legacySetupWizardStateMigrated, | ||
| showUnityCliLoopSecuritySetting = showUnityCliLoopSecuritySetting, | ||
| showToolSettings = showToolSettings, | ||
| installSkillsFlat = installSkillsFlat | ||
| }; | ||
| } | ||
|
|
||
| internal static UnityCliLoopEditorSettingsJsonData FromDomain(UnityCliLoopEditorSettingsData settings) | ||
| { | ||
| Debug.Assert(settings != null, "settings must not be null"); | ||
|
|
||
| if (settings == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(settings)); | ||
| } | ||
|
|
||
| return new UnityCliLoopEditorSettingsJsonData | ||
| { | ||
| showDeveloperTools = settings.showDeveloperTools, | ||
| lastSeenSetupWizardVersion = settings.lastSeenSetupWizardVersion, | ||
| lastSeenSetupWizardMinimumDispatcherVersion = settings.lastSeenSetupWizardMinimumDispatcherVersion, | ||
| suppressSetupWizardAutoShow = settings.suppressSetupWizardAutoShow, | ||
| legacySetupWizardStateMigrated = settings.legacySetupWizardStateMigrated, | ||
| showUnityCliLoopSecuritySetting = settings.showUnityCliLoopSecuritySetting, | ||
| showToolSettings = settings.showToolSettings, | ||
| installSkillsFlat = settings.installSkillsFlat | ||
| }; | ||
| } | ||
| } | ||
| } | ||
11 changes: 11 additions & 0 deletions
11
Packages/src/Editor/Infrastructure/Settings/UnityCliLoopEditorSettingsJsonData.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P3: FromDomain is an internal method, so the ArgumentNullException throw after the Debug.Assert is redundant and adds unnecessary exception surface. The project convention for internal APIs is to enforce preconditions with Debug.Assert alone. Remove the
if (settings == null)guard and let the assert serve as the contract check.Prompt for AI agents