Anonymous avatar Anonymous committed 1681671

default should always be the first in ask_values()

Comments (0)

Files changed (1)

         return ask_func(**ask_args)
     def ask_values(self, prompt, values, default=None, starting=None, exact=True):
-        if default:
-            prompt = prompt
+        if default is not None and default in values:
+            values = list(values)
+            values.remove(default)
+            values.insert(0, default)
         numbered = [prompt]
         for index, value in enumerate(values):
             numbered.append('%s. %s' % (index + 1, value))
         result = int(call('inputlist(%s)' % numbered))
         if result != 0:
             return values[result - 1]
+        elif 'cancel' in values:
+            return 'cancel'
     def ask(self, prompt, default=None, starting=None):
         if starting is None:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.