From ecb747f84990ff1b422545e02a29d21307a59a28 Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Fri, 7 Feb 2014 11:27:24 +0100
Subject: [PATCH] Add more assertions to tokenizer

---
 .../java/org/springframework/shell/core/SimpleParser.java | 3 ++-
 .../java/org/springframework/shell/core/Tokenizer.java    | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/shell/core/SimpleParser.java b/src/main/java/org/springframework/shell/core/SimpleParser.java
index 0c06e257..805e71f6 100644
--- a/src/main/java/org/springframework/shell/core/SimpleParser.java
+++ b/src/main/java/org/springframework/shell/core/SimpleParser.java
@@ -749,7 +749,8 @@ public class SimpleParser implements Parser {
 			}
 
 			// Handle completing the option key they're presently typing
-			if (lastOptionKey != null && "".equals(lastOptionValue)) {
+			if (lastOptionKey != null && "".equals(lastOptionValue)
+					&& !translated.endsWith("" + tokenizer.getLastValueDelimiter())) {
 				// Given we haven't got an option value of any form, we must
 				// still be typing an option key.
 				for (CliOption option : unspecified) {
diff --git a/src/main/java/org/springframework/shell/core/Tokenizer.java b/src/main/java/org/springframework/shell/core/Tokenizer.java
index b8f7592a..ef7937cc 100644
--- a/src/main/java/org/springframework/shell/core/Tokenizer.java
+++ b/src/main/java/org/springframework/shell/core/Tokenizer.java
@@ -19,6 +19,8 @@ package org.springframework.shell.core;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.util.Assert;
+
 /**
  * Converts a particular buffer into a tokenized structure.
  * 
@@ -58,7 +60,7 @@ public class Tokenizer {
 
 	private char lastValueDelimiter;
 
-	private int lastValueStartOffset;
+	private int lastValueStartOffset = -1;
 
 	public Tokenizer(String text) {
 		this(text, false);
@@ -153,6 +155,7 @@ public class Tokenizer {
 	 * Return the offset at which the last value seen started (NOT including any delimiter).
 	 */
 	public int getLastValueStartOffset() {
+		Assert.isTrue(lastValueStartOffset >= 0, "lastValueStartOffset has not been set yet");
 		return lastValueStartOffset;
 	}
 
@@ -160,6 +163,7 @@ public class Tokenizer {
 	 * Return the delimiter (space or quotes) that was (or is being) used for the last value.
 	 */
 	public char getLastValueDelimiter() {
+		Assert.isTrue(lastValueDelimiter != 0, "lastValueDelimiter has not been set yet");
 		return lastValueDelimiter;
 	}
 
@@ -191,6 +195,8 @@ public class Tokenizer {
 			value = eatValue();
 		}
 		else {
+			lastValueDelimiter = ' ';
+			lastValueStartOffset = pos;
 			value = "";
 		}
 		if (!key.equals("") || !key.equals(value)) {