Restructured ParseFolderList/Async to improve code coverage

jstedfast · Dec 31, 2023 · 6ad1c01 · 6ad1c01
1 parent 46df9e8
commit 6ad1c01
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/MailKit/Net/Imap/ImapUtils.cs b/MailKit/Net/Imap/ImapUtils.cs
@@ -673,7 +673,7 @@ public static void ParseFolderList (ImapEngine engine, List<ImapFolder> list, bo
 					if (token.Type == ImapTokenType.CloseParen)
 						break;
 
-					// a LIST extension
+					// A LIST extension (rfc5258).
 
 					ImapEngine.AssertToken (token, ImapTokenType.Atom, ImapTokenType.QString, format, token);
 
@@ -691,8 +691,10 @@ public static void ParseFolderList (ImapEngine engine, List<ImapFolder> list, bo
 
 						engine.Stream.UngetToken (token);
 
+						var value = ReadNStringToken (engine, format, false, cancellationToken);
+
 						if (!renamed && atom.Equals ("OLDNAME", StringComparison.OrdinalIgnoreCase)) {
-							var oldEncodedName = ReadFolderName (engine, delim, format, cancellationToken);
+							var oldEncodedName = value.TrimEnd (delim);
 
 							if (engine.FolderCache.TryGetValue (oldEncodedName, out ImapFolder oldFolder)) {
 								var args = new ImapFolderConstructorArgs (engine, encodedName, attrs, delim);
@@ -704,8 +706,6 @@ public static void ParseFolderList (ImapEngine engine, List<ImapFolder> list, bo
 							}
 
 							renamed = true;
-						} else {
-							ReadNStringToken (engine, format, false, cancellationToken);
 						}
 					} while (true);
 				} while (true);
@@ -782,7 +782,7 @@ public static async Task ParseFolderListAsync (ImapEngine engine, List<ImapFolde
 					if (token.Type == ImapTokenType.CloseParen)
 						break;
 
-					// a LIST extension
+					// A LIST extension (rfc5258).
 
 					ImapEngine.AssertToken (token, ImapTokenType.Atom, ImapTokenType.QString, format, token);
 
@@ -800,10 +800,12 @@ public static async Task ParseFolderListAsync (ImapEngine engine, List<ImapFolde
 
 						engine.Stream.UngetToken (token);
 
-						if (!renamed && atom.Equals ("OLDNAME", StringComparison.OrdinalIgnoreCase)) {
-							var oldEncodedName = await ReadFolderNameAsync (engine, delim, format, cancellationToken).ConfigureAwait (false);
+						var value = await ReadNStringTokenAsync (engine, format, false, cancellationToken).ConfigureAwait (false);
 
-							if (engine.FolderCache.TryGetValue (oldEncodedName, out ImapFolder oldFolder)) {
+						if (atom.Equals ("OLDNAME", StringComparison.OrdinalIgnoreCase)) {
+							var oldEncodedName = value.TrimEnd (delim);
+
+							if (!renamed && engine.FolderCache.TryGetValue (oldEncodedName, out ImapFolder oldFolder)) {
 								var args = new ImapFolderConstructorArgs (engine, encodedName, attrs, delim);
 
 								engine.FolderCache.Remove (oldEncodedName);
@@ -813,8 +815,6 @@ public static async Task ParseFolderListAsync (ImapEngine engine, List<ImapFolde
 							}
 
 							renamed = true;
-						} else {
-							await ReadNStringTokenAsync (engine, format, false, cancellationToken).ConfigureAwait (false);
 						}
 					} while (true);
 				} while (true);