Add an ImapTokenType.Plus enum value to simplify things a tad

jstedfast · Aug 20, 2023 · 8915ab5 · 8915ab5
1 parent 7e801ec
commit 8915ab5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/MailKit/Net/Imap/ImapCommand.cs b/MailKit/Net/Imap/ImapCommand.cs
@@ -903,8 +903,7 @@ public bool Step ()
 					token = Engine.ReadToken (CancellationToken);
 				}
 
-				// FIXME: can we have a '+' token instead of using an Atom?
-				if (token.Type == ImapTokenType.Atom && token.Value.ToString () == "+") {
+				if (token.Type == ImapTokenType.Plus) {
 					// we've gotten a continuation response from the server
 					var text = Engine.ReadLine (CancellationToken).Trim ();
 
@@ -1045,8 +1044,7 @@ public async Task<bool> StepAsync ()
 					token = await Engine.ReadTokenAsync (CancellationToken).ConfigureAwait (false);
 				}
 
-				// FIXME: can we have a '+' token instead of using an Atom?
-				if (token.Type == ImapTokenType.Atom && token.Value.ToString () == "+") {
+				if (token.Type == ImapTokenType.Plus) {
 					// we've gotten a continuation response from the server
 					var text = (await Engine.ReadLineAsync (CancellationToken).ConfigureAwait (false)).Trim ();
 

diff --git a/MailKit/Net/Imap/ImapStream.cs b/MailKit/Net/Imap/ImapStream.cs
@@ -836,6 +836,12 @@ public ImapToken ReadToken (string specials, CancellationToken cancellationToken
 			if (c == '\\')
 				return ReadFlagToken (specials, cancellationToken);
 
+			if (c == '+') {
+				inputIndex++;
+
+				return ImapToken.Plus;
+			}
+
 			if (IsAtom (input[inputIndex], specials))
 				return ReadAtomToken (specials, cancellationToken);
 
@@ -882,6 +888,12 @@ public async ValueTask<ImapToken> ReadTokenAsync (string specials, CancellationT
 			if (c == '\\')
 				return await ReadFlagTokenAsync (specials, cancellationToken).ConfigureAwait (false);
 
+			if (c == '+') {
+				inputIndex++;
+
+				return ImapToken.Plus;
+			}
+
 			if (IsAtom (input[inputIndex], specials))
 				return await ReadAtomTokenAsync (specials, cancellationToken).ConfigureAwait (false);
 

diff --git a/MailKit/Net/Imap/ImapToken.cs b/MailKit/Net/Imap/ImapToken.cs
@@ -46,10 +46,12 @@ enum ImapTokenType {
 		Asterisk      = (int) '*',
 		OpenBracket   = (int) '[',
 		CloseBracket  = (int) ']',
+		Plus          = (int) '+',
 	}
 
 	class ImapToken
 	{
+		public static readonly ImapToken Plus = new ImapToken (ImapTokenType.Plus, '+');
 		public static readonly ImapToken Asterisk = new ImapToken (ImapTokenType.Asterisk, '*');
 		public static readonly ImapToken OpenParen = new ImapToken (ImapTokenType.OpenParen, '(');
 		public static readonly ImapToken CloseParen = new ImapToken (ImapTokenType.CloseParen, ')');
@@ -105,6 +107,7 @@ class ImapToken
 		public static ImapToken Create (ImapTokenType type, char c)
 		{
 			switch (type) {
+			case ImapTokenType.Plus: return Plus;
 			case ImapTokenType.Asterisk: return Asterisk;
 			case ImapTokenType.OpenParen: return OpenParen;
 			case ImapTokenType.CloseParen: return CloseParen;