Skip to content

Commit b5aef83

Browse files
committed
[flutter_tools] Resolve global options following subcommands and assert disable lifecycle
In _optionTokenCount, fall back to checking the root argParser when an option is not found in the current subcommand parser. This ensures global options with value arguments passed after a subcommand consume their arguments properly rather than treating the value as a subcommand name. Also add an assertion to ExtensionManager.disable() to ensure disable() cannot be called after initialization has started. Part of flutter#190755
1 parent eef3394 commit b5aef83

4 files changed

Lines changed: 42 additions & 1 deletion

File tree

‎packages/flutter_tools/lib/src/experimental/extension_manager.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class ExtensionManager {
4343
/// Disables tool extension initialization for the current CLI invocation
4444
/// (for example, when `--no-extensions` is passed).
4545
void disable() {
46+
assert(_initFuture == null, 'disable() cannot be called after initialization has started.');
4647
_isDisabled = true;
4748
}
4849

‎packages/flutter_tools/lib/src/runner/flutter_command_runner.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,11 @@ class FlutterCommandRunner extends CommandRunner<void> {
431431
if (name.contains('=')) {
432432
return 1;
433433
}
434-
final Option? option = parser.findByNameOrAlias(name) ?? parser.findByAbbreviation(name);
434+
final Option? option =
435+
parser.findByNameOrAlias(name) ??
436+
parser.findByAbbreviation(name) ??
437+
argParser.findByNameOrAlias(name) ??
438+
argParser.findByAbbreviation(name);
435439
if (option != null) {
436440
return option.isFlag ? 1 : 2;
437441
}

‎packages/flutter_tools/test/general.shard/extension_protocol/extension_manager_test.dart‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,20 @@ void main() {
8181
await disabledManager.dispose();
8282
},
8383
);
84+
85+
testWithoutContext(
86+
'disable throws AssertionError when called after initialization has started',
87+
() async {
88+
final logger = BufferLogger.test();
89+
final manager = ExtensionManager(
90+
hostPlatform: HostPlatform.linux_x64,
91+
logger: logger,
92+
featureFlags: TestFeatureFlags(isToolExtensionsEnabled: true),
93+
);
94+
await manager.ensureInitialized();
95+
expect(() => manager.disable(), throwsA(isA<AssertionError>()));
96+
await manager.dispose();
97+
},
98+
);
8499
});
85100
}

‎packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,27 @@ void main() {
749749
},
750750
);
751751

752+
testWithoutContext('resolves global options with arguments after a subcommand during dynamic option initialization', () async {
753+
final toolContext = FakeToolContext();
754+
final dynamicSubcommand = _FakeDynamicFlutterCommand(
755+
commandName: 'dynamic-sub',
756+
toolContext: toolContext,
757+
);
758+
final parentCommand = _FakeParentFlutterCommand(
759+
subcommand: dynamicSubcommand,
760+
toolContext: toolContext,
761+
);
762+
final runner = FlutterCommandRunner(
763+
toolContext: toolContext,
764+
featureFlags: TestFeatureFlags(isToolExtensionsEnabled: true),
765+
)..addCommand(parentCommand);
766+
767+
// Pass global option '--wrap-column' with value '80' between parent command and subcommand.
768+
await runner.run(<String>['parent-cmd', '--wrap-column', '80', 'dynamic-sub']);
769+
770+
expect(dynamicSubcommand.didInitializeDynamicOptions, isTrue);
771+
});
772+
752773
testWithoutContext(
753774
'initializes dynamic options when --extensions overrides preceding --no-extensions',
754775
() async {

0 commit comments

Comments
 (0)