improve tracked detection

emberjs · Nov 10, 2023 · 9908462 · 9908462
1 parent ba75238
commit 9908462
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -76,8 +76,10 @@ try {
   }
 }
 
+let TrackedDescriptor;
 try {
   let metal = EmberLoader.require('@ember/-internals/metal');
+  TrackedDescriptor = metal.TrackedDescriptor
 
   tagForProperty = metal.tagForProperty;
   // If track was not already loaded, use metal's version (the previous version)
@@ -968,6 +970,10 @@ function addProperties(properties, hash) {
     if (desc.get) {
       options.isGetter = true;
       options.canTrack = true;
+      options.isTracked = desc instanceof TrackedDescriptor;
+      if (options.isTracked) {
+        options.code = '';
+      }
       if (!desc.set) {
         options.readOnly = true;
       }
@@ -1115,12 +1121,6 @@ function calculateCPs(
             tagInfo.tag = track(() => {
               value = calculateCP(object, item, errorsForObject);
             });
-            if (tagInfo.tag === tagForProperty(object, item.name)) {
-              if (!item.isComputed && !item.isService) {
-                item.code = '';
-                item.isTracked = true;
-              }
-            }
             tagInfo.revision = tagValue(tagInfo.tag);
             item.dependentKeys = getTrackedDependencies(
               object,