fix: gate naming

Author: jhefferman-sfdc

packages/@lwc/engine-core/src/framework/invoker.ts

@@ -58,11 +58,10 @@ export function invokeComponentConstructor(vm: VM, Ctor: LightningElementConstru
         // When Locker is enabled, the "instanceof" operator would not work since Locker Service
         // provides its own implementation of LightningElement, so we indirectly check
         // if the base constructor is invoked by accessing the component on the vm.
-        // When the DISABLE_LIGHTNING_CONSTRUCTOR_CHECK gate is true and LEGACY_LOCKER_ENABLED is false,
+        // When the ENABLE_LOCKER_VALIDATION gate is true and LEGACY_LOCKER_ENABLED is false,
         // then the instanceof LightningElement can be used.
         const useLegacyConstructorCheck =
-            lwcRuntimeFlags.DISABLE_LIGHTNING_CONSTRUCTOR_CHECK ||
-            lwcRuntimeFlags.LEGACY_LOCKER_ENABLED;
+            lwcRuntimeFlags.ENABLE_LEGACY_VALIDATION || lwcRuntimeFlags.LEGACY_LOCKER_ENABLED;
 
         const isInvalidConstructor = useLegacyConstructorCheck
             ? vmBeingConstructed.component !== result

packages/@lwc/features/src/index.ts

@@ -22,7 +22,7 @@ const features: FeatureFlagMap = {
     DISABLE_SYNTHETIC_SHADOW: null,
     DISABLE_SCOPE_TOKEN_VALIDATION: null,
     LEGACY_LOCKER_ENABLED: null,
-    DISABLE_LIGHTNING_CONSTRUCTOR_CHECK: null,
+    ENABLE_LEGACY_VALIDATION: null,
 };
 
 if (!(globalThis as any).lwcRuntimeFlags) {

packages/@lwc/features/src/types.ts

@@ -88,10 +88,11 @@ export interface FeatureFlagMap {
     LEGACY_LOCKER_ENABLED: FeatureFlagValue;
 
     /**
-     * If true, then the legacy constructor check is only used if
-     * LEGACY_LOCKER_ENABLED is true.
+     * A manual override for `LEGACY_LOCKER_ENABLED`; should not be used if that flag is correctly set.
+     * If true, behave as if legacy Locker is enabled.
+     * If false or unset, then the value of the `LEGACY_LOCKER_ENABLED` flag is used.
      */
-    DISABLE_LIGHTNING_CONSTRUCTOR_CHECK: FeatureFlagValue;
+    ENABLE_LEGACY_VALIDATION: FeatureFlagValue;
 }
 
 export type FeatureFlagName = keyof FeatureFlagMap;

packages/@lwc/integration-karma/test/component/LightningElement/index.spec.js

@@ -81,7 +81,7 @@ it("[W-6981076] shouldn't throw when a component with an invalid child in unmoun
     expect(() => document.body.removeChild(elm)).not.toThrow();
 });
 
-it('should fail when the constructor returns something other than LightningElement when DISABLE_LIGHTNING_CONSTRUCTOR_CHECK is true', () => {
+it('should fail when the constructor returns something other than LightningElement when ENABLE_LEGACY_VALIDATION is falsy and LEGACY_LOCKER_ENABLED is falsy', () => {
     expect(() => {
         createElement('x-returning-bad', { is: ReturningBad });
     }).toThrowError(
@@ -90,10 +90,20 @@ it('should fail when the constructor returns something other than LightningEleme
     );
 });
 
-it('should succeed when the constructor returns something other than LightningElement when DISABLE_LIGHTNING_CONSTRUCTOR_CHECK is falsy', () => {
-    setFeatureFlagForTest('DISABLE_LIGHTNING_CONSTRUCTOR_CHECK', true);
+it('should succeed when the constructor returns something other than LightningElement when ENABLE_LEGACY_VALIDATION is true', () => {
+    setFeatureFlagForTest('ENABLE_LEGACY_VALIDATION', true);
     expect(() => {
         createElement('x-returning-bad', { is: ReturningBad });
     }).not.toThrow();
-    setFeatureFlagForTest('DISABLE_LIGHTNING_CONSTRUCTOR_CHECK', false);
+    setFeatureFlagForTest('ENABLE_LEGACY_VALIDATION', false);
+});
+
+it('should succeed when the constructor returns something other than LightningElement when ENABLE_LEGACY_VALIDATION is false and LEGACY_LOCKER_ENABLED is true', () => {
+    setFeatureFlagForTest('ENABLE_LEGACY_VALIDATION', false);
+    setFeatureFlagForTest('LEGACY_LOCKER_ENABLED', true);
+    expect(() => {
+        createElement('x-returning-bad', { is: ReturningBad });
+    }).not.toThrow();
+    setFeatureFlagForTest('ENABLE_LEGACY_VALIDATION', false);
+    setFeatureFlagForTest('LEGACY_LOCKER_ENABLED', false);
 });