fix: support Unity 2022.2

mob-sakai · mob-sakai · commit 94ef69c091ad · 2022-05-18T04:17:53.000+09:00
diff --git a/Editor/Coffee.UpmGitExtension/Extensions/UpmPackageVersionEx.cs b/Editor/Coffee.UpmGitExtension/Extensions/UpmPackageVersionEx.cs
@@ -35,7 +35,7 @@ public UpmPackageVersionEx(UpmPackageVersion packageVersion) : base(packageVersi
             OnAfterDeserialize();
         }
 
-        public override string versionString => m_VersionString;
+        public string fullVersionString { get; private set; }
         public SemVersion semVersion { get; private set; }
 
         [SerializeField]
@@ -77,9 +77,13 @@ public override void OnAfterDeserialize()
 
             semVersion = m_Version ?? new SemVersion();
             var revision = packageInfo?.git?.revision ?? "";
-            if (!revision.Contains(m_VersionString))
+            if (!revision.Contains(m_VersionString) && 0 < revision.Length)
             {
-                m_VersionString = $"{m_Version} ({revision})";
+                fullVersionString = $"{m_Version} ({revision})";
+            }
+            else
+            {
+                fullVersionString = m_Version.ToString();
             }
 
             try
diff --git a/Editor/Coffee.UpmGitExtension/GitPackageDataBase.cs b/Editor/Coffee.UpmGitExtension/GitPackageDataBase.cs
@@ -227,6 +227,10 @@ private static void UpdateGitPackageVersions()
                         // Git mode: Register all installable package versions.
                         var upmPackage = _packageDatabase.GetPackage(versions.Key) as UpmPackage;
                         var installedVersion = upmPackage.versions.installed as UpmPackageVersion;
+                        if (installedVersion.packageInfo.source == UnityEditor.PackageManager.PackageSource.Embedded)
+                            return upmPackage;
+
+                        // Unlock.
                         installedVersion.UnlockVersion();
 
                         var newVersions = new[] { new UpmPackageVersionEx(installedVersion) }
diff --git a/Editor/Coffee.UpmGitExtension/UI/PackageDetailsExtension.cs b/Editor/Coffee.UpmGitExtension/UI/PackageDetailsExtension.cs
@@ -19,6 +19,7 @@ internal class PackageDetailsExtension
         //################################
         public void Setup(VisualElement root)
         {
+            _root = root;
             _packageDetails = root.Q<PackageDetails>();
 
             var hostButton = _packageDetails.Q<Button>("hostButton");
@@ -55,14 +56,16 @@ public void Setup(VisualElement root)
                 upmGitExtension.Add(new Label() { name = "detailSourcePath" });
             }
 #endif
+
             // Register callbacks.
-            _versionItems = root.Query<PackageVersionItem>().Build();
             EditorApplication.delayCall += () =>
             {
+#if UNITY_2022_2_OR_NEWER
+#elif UNITY_2021_2_OR_NEWER || UNITY_2021_1_20 || UNITY_2021_1_21 || UNITY_2021_1_22 || UNITY_2021_1_23 || UNITY_2021_1_24 || UNITY_2021_1_25 || UNITY_2021_1_26 || UNITY_2021_1_27 || UNITY_2021_1_28
                 _pageManager.onVisualStateChange += _ => RefleshVersionItems();
-#if UNITY_2021_2_OR_NEWER || UNITY_2021_1_20 || UNITY_2021_1_21 || UNITY_2021_1_22 || UNITY_2021_1_23 || UNITY_2021_1_24 || UNITY_2021_1_25 || UNITY_2021_1_26 || UNITY_2021_1_27 || UNITY_2021_1_28
                 _pageManager.onListUpdate += _ => RefleshVersionItems();
 #else
+                _pageManager.onVisualStateChange += _ => RefleshVersionItems();
                 _pageManager.onListUpdate += (_, __, ___, ____) => RefleshVersionItems();
 #endif
             };
@@ -122,6 +125,10 @@ public void OnPackageSelectionChange(PackageInfo packageInfo)
                     var package = GitPackageDatabase.GetPackage(packageInfo.name);
                     _targetVersion = package.versions.installed != null ? package.versions.recommended : package.versions.primary;
                 }
+
+#if UNITY_2022_2_OR_NEWER
+                RefleshVersionItems();
+#endif
             }
         }
 
@@ -133,7 +140,7 @@ public void OnPackageSelectionChange(PackageInfo packageInfo)
         private IPackageVersion _targetVersion;
         private Clickable _clickableToUpdate;
         private Button _updateButton;
-        private UQueryState<PackageVersionItem> _versionItems;
+        private VisualElement _root;
 #if UNITY_2020_2_OR_NEWER
         private static PageManager _pageManager => ScriptableSingleton<ServicesContainer>.instance.Resolve<PageManager>();
 #else
@@ -191,14 +198,18 @@ private void UpdatePackage()
 
         private void RefleshVersionItems()
         {
-            _versionItems.ForEach(item =>
+#if UNITY_2022_2_OR_NEWER
+            var items = _root.Query<PackageDetailsVersionHistoryItem>().Build()
+                .Select(item => new { label = item.Q<Toggle>("versionHistoryItemToggle")?.Q<Label>(), version = item.version as UpmPackageVersionEx });
+#else
+            var items = _root.Query<PackageVersionItem>().Build().ToList()
+                .Select(item => new { label = item.Q<Label>("versionLabel"), version = item.version as UpmPackageVersionEx });
+#endif
+            foreach(var item in items)
             {
-                var text = item.Q<Label>("versionLabel");
-                if (text != null && item.version.HasTag(PackageTag.Git))
-                {
-                    text.text = item.version.versionString;
-                }
-            });
+                if (item.label != null && item.version != null)
+                    item.label.text = item.version.fullVersionString;
+            }
         }
     }
 }
diff --git a/Editor/Coffee.UpmGitExtension/UI/SearchResultListView.cs b/Editor/Coffee.UpmGitExtension/UI/SearchResultListView.cs
@@ -53,7 +53,11 @@ public SearchResultListView(TextField textField, Func<string[]> searchFunc) : ba
 
             makeItem = () => new Label();
             bindItem = (e, i) => (e as Label).text = _searchedItems[i];
+#if UNITY_2022_2_OR_NEWER
+            selectionChanged += o =>
+#else
             onSelectionChange += o =>
+#endif
             {
                 textField.value = o.FirstOrDefault() as string ?? "";
                 UIUtils.SetElementDisplay(this, false);
