allow entering allowed input in dub init

dlang · Jan 11, 2023 · 0c582d9 · 0c582d9
1 parent 4c72b12
commit 0c582d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/source/dub/commandline.d b/source/dub/commandline.d
@@ -1019,7 +1019,7 @@ class InitCommand : Command {
 					if (option_idx < options.length)
 						return options[option_idx];
 				}
-				else if (free_choice)
+				else if (free_choice || options.canFind(choice))
 					return choice;
 				logError("Select an option between 1 and %u%s.", options.length,
 						 free_choice ? " or enter a custom value" : null);

diff --git a/test/0-init-interactive.sh b/test/0-init-interactive.sh
@@ -27,8 +27,10 @@ function runTest {
 runTest '0\ntest\ndesc\nauthor\ngpl\ncopy\n\n' 0-init-interactive.dub.sdl
 # select package format out of bounds
 runTest '3\n0\ntest\ndesc\nauthor\ngpl\ncopy\n\n' 0-init-interactive.dub.sdl
-# select package format not numeric
-runTest 'sdl\n0\ntest\ndesc\nauthor\ngpl\ncopy\n\n' 0-init-interactive.dub.sdl
+# select package format not numeric, but in list
+runTest 'sdl\ntest\ndesc\nauthor\ngpl\ncopy\n\n' 0-init-interactive.dub.sdl
+# selected value not numeric and not in list
+runTest 'sdlf\n0\ntest\ndesc\nauthor\ngpl\ncopy\n\n' 0-init-interactive.dub.sdl
 # default name
 runTest '0\n\ndesc\nauthor\ngpl\ncopy\n\n' 0-init-interactive.default_name.dub.sdl
 # json package format