From b81b695382e94338d37d2eb0d632901af163d3f4 Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Mon, 16 Oct 2017 15:44:33 +0200
Subject: [PATCH] Fix completion of params that involve conversion

Fixes #170
---
 .../shell/standard/StandardParameterResolver.java         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardParameterResolver.java b/spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardParameterResolver.java
index 1ba4a10b..75ca3327 100644
--- a/spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardParameterResolver.java
+++ b/spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardParameterResolver.java
@@ -361,11 +361,8 @@ public class StandardParameterResolver implements ParameterResolver {
 			}
 		}
 		catch (Exception e) {
-			unfinished = e;
-			set = false;
 			// Most likely what is already typed would fail resolution (eg type conversion failure)
-			// Exit early and let other parameters have a chance at being proposed
-			return Collections.emptyList();
+			return argumentKeysThatStartWithContextPrefix(methodParameter, context);
 		}
 
 		// There are 4 possible cases:
@@ -378,7 +375,8 @@ public class StandardParameterResolver implements ParameterResolver {
 		// key
 
 		if (!set) {
-			if (unfinished == null) { // case 1 above
+			if (unfinished == null) {
+				// case 1 above
 				return argumentKeysThatStartWithContextPrefix(methodParameter, context);
 			} // case 2
 			else {