From 38fd356ec38a0a88724e356452b54aa29f08baa0 Mon Sep 17 00:00:00 2001 From: Sergey Penkovsky Date: Wed, 30 Jul 2025 08:17:49 +0300 Subject: [PATCH] Remove dead code: _createDependencyKey (no longer used, cycle detection not affected) --- cherrypick/example/cherrypick_helper_example.dart | 3 +++ cherrypick/lib/src/global_cycle_detector.dart | 10 ++++++---- cherrypick/test/src/cross_scope_cycle_test.dart | 1 + cherrypick/test/src/global_cycle_detection_test.dart | 1 + examples/client_app/pubspec.lock | 8 ++++---- examples/postly/pubspec.lock | 6 +++--- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/cherrypick/example/cherrypick_helper_example.dart b/cherrypick/example/cherrypick_helper_example.dart index 04f483d..7d1ee0d 100644 --- a/cherrypick/example/cherrypick_helper_example.dart +++ b/cherrypick/example/cherrypick_helper_example.dart @@ -151,6 +151,7 @@ void main() { CherryPick.closeRootScope(); // Создаем скоуп без обнаружения + // ignore: unused_local_variable final specificScope = CherryPick.openRootScope(); print(' Detection in root scope: ${CherryPick.isCycleDetectionEnabledForScope()}'); @@ -159,6 +160,7 @@ void main() { print('✅ Detection enabled for root scope: ${CherryPick.isCycleDetectionEnabledForScope()}'); // Создаем дочерний скоуп + // ignore: unused_local_variable final featureScope = CherryPick.openScope(scopeName: 'feature.auth'); print(' Detection in feature.auth scope: ${CherryPick.isCycleDetectionEnabledForScope(scopeName: 'feature.auth')}'); @@ -191,6 +193,7 @@ void main() { print(' Chain before resolve: ${CherryPick.getCurrentResolutionChain()}'); // The chain is populated during resolution, but cleared after completion + // ignore: unused_local_variable final trackedUserService = trackingScope.resolve(); print(' Chain after resolve: ${CherryPick.getCurrentResolutionChain()}'); print(''); diff --git a/cherrypick/lib/src/global_cycle_detector.dart b/cherrypick/lib/src/global_cycle_detector.dart index 2c26d27..e32e064 100644 --- a/cherrypick/lib/src/global_cycle_detector.dart +++ b/cherrypick/lib/src/global_cycle_detector.dart @@ -142,15 +142,17 @@ class GlobalCycleDetector { void clear() { _globalResolutionStack.clear(); _globalResolutionHistory.clear(); - _scopeDetectors.values.forEach((detector) => detector.clear()); + _scopeDetectors.values.forEach(_detectorClear); _scopeDetectors.clear(); } + void _detectorClear(detector) => detector.clear(); + /// RU: Создать уникальный ключ для зависимости с учетом скоупа. /// ENG: Create unique key for dependency including scope. - String _createDependencyKey(String? named, String? scopeId) { - return _createDependencyKeyFromType(T, named, scopeId); - } + //String _createDependencyKey(String? named, String? scopeId) { + // return _createDependencyKeyFromType(T, named, scopeId); + //} /// RU: Создать уникальный ключ для зависимости по типу с учетом скоупа. /// ENG: Create unique key for dependency by type including scope. diff --git a/cherrypick/test/src/cross_scope_cycle_test.dart b/cherrypick/test/src/cross_scope_cycle_test.dart index eb62f33..af87a68 100644 --- a/cherrypick/test/src/cross_scope_cycle_test.dart +++ b/cherrypick/test/src/cross_scope_cycle_test.dart @@ -60,6 +60,7 @@ void main() { // В текущей реализации это может не обнаружить циклическую зависимость // если детекторы работают независимо в каждом скоупе try { + // ignore: unused_local_variable final service = parentScope.resolve(); // Если мы дошли сюда, значит циклическая зависимость не была обнаружена print('Циклическая зависимость между скоупами не обнаружена'); diff --git a/cherrypick/test/src/global_cycle_detection_test.dart b/cherrypick/test/src/global_cycle_detection_test.dart index 5e77ecc..1d0c84b 100644 --- a/cherrypick/test/src/global_cycle_detection_test.dart +++ b/cherrypick/test/src/global_cycle_detection_test.dart @@ -142,6 +142,7 @@ void main() { test('should clear global cycle detector state', () { CherryPick.enableGlobalCrossScopeCycleDetection(); + // ignore: unused_local_variable final scope = CherryPick.openGlobalSafeRootScope(); expect(CherryPick.getGlobalResolutionChain(), isEmpty); diff --git a/examples/client_app/pubspec.lock b/examples/client_app/pubspec.lock index 10f7075..91cba2d 100644 --- a/examples/client_app/pubspec.lock +++ b/examples/client_app/pubspec.lock @@ -127,28 +127,28 @@ packages: path: "../../cherrypick" relative: true source: path - version: "2.2.0-dev.1" + version: "2.2.0" cherrypick_annotations: dependency: "direct main" description: path: "../../cherrypick_annotations" relative: true source: path - version: "1.1.0-dev.1" + version: "1.1.0" cherrypick_flutter: dependency: "direct main" description: path: "../../cherrypick_flutter" relative: true source: path - version: "1.1.2-dev.1" + version: "1.1.2" cherrypick_generator: dependency: "direct dev" description: path: "../../cherrypick_generator" relative: true source: path - version: "1.1.0-dev.5" + version: "1.1.0" clock: dependency: transitive description: diff --git a/examples/postly/pubspec.lock b/examples/postly/pubspec.lock index df81ea0..fcba66b 100644 --- a/examples/postly/pubspec.lock +++ b/examples/postly/pubspec.lock @@ -151,21 +151,21 @@ packages: path: "../../cherrypick" relative: true source: path - version: "2.2.0-dev.1" + version: "2.2.0" cherrypick_annotations: dependency: "direct main" description: path: "../../cherrypick_annotations" relative: true source: path - version: "1.1.0-dev.1" + version: "1.1.0" cherrypick_generator: dependency: "direct dev" description: path: "../../cherrypick_generator" relative: true source: path - version: "1.1.0-dev.5" + version: "1.1.0" clock: dependency: transitive description: