Fix string wrapping deleting closing quotes

Author: spoonmilk

formatter/generic/genericformatter.cpp

@@ -362,10 +362,10 @@ static vector<Item> CreateStringGroups(const vector<Item>& items)
 		if (i.type == StringSeparator && !i.tokens.empty())
 		{
 			// We try to push separators onto a preceding word, otherwise treat as
-			// a singular atom
+			// a singular string component
 			if (pending.empty())
 			{
-				result.push_back(Item {Atom, {}, {i.tokens}, 0});
+				result.push_back(Item {StringComponent, {}, {i.tokens}, 0});
 			}
 			else
 			{
@@ -378,7 +378,8 @@ static vector<Item> CreateStringGroups(const vector<Item>& items)
 		}
     	else if (i.type == StringWhitespace)
     	{
-    		// Special case because we let whitespace trail even if over width
+    		// Whitespace is allowed to exceed width without wrapping, so we use a special
+    		// type for it.
     		if (!pending.empty())
     		{
     			result.push_back(Item {StringComponent, pending, {}, 0});
@@ -395,17 +396,17 @@ static vector<Item> CreateStringGroups(const vector<Item>& items)
     			result.push_back(Item {StringComponent, pending, {}, 0 });
     			pending.clear();
     		}
-    		result.push_back(Item { Atom, i.items, i.tokens, i.width});
+    		result.push_back(Item { StringComponent, i.items, i.tokens, i.width});
     	}
-
     	else if (i.type == StartOfContainer && pending.empty())
     	{
     		result.push_back(i);
     	}
     	else if (i.type == EndOfContainer && hasStrings && !pending.empty())
     	{
-    		result.push_back(Item {StringComponent, pending, {}, 0});
+    		result.push_back(Item {Group, pending, {}, 0});
     		result.push_back(i);
+    		pending.clear();
     	}
     	else
     	{
@@ -748,16 +749,16 @@ vector<DisassemblyTextLine> GenericLineFormatter::FormatLines(
 		size_t desiredStringWidth = settings.stringWrappingWidth;
 		if (indentation < settings.desiredLineLength)
 		{
-			size_t remainingStringWidth = desiredStringWidth - indentation;
-			if (remainingStringWidth > desiredStringWidth)
+			size_t remainingStringWidth = settings.desiredLineLength - indentation;
+			if (remainingStringWidth > desiredWidth)
 				desiredStringWidth = remainingStringWidth;
 		}
 
 		// Compute target width for continuation string wrapping lines
 		size_t desiredStringContinuationWidth = settings.stringWrappingWidth;
 		if (continuationIndentation < settings.desiredLineLength)
 		{
-			size_t remainingStringWidth = desiredStringContinuationWidth - continuationIndentation;
+			size_t remainingStringWidth = settings.desiredLineLength - continuationIndentation;
 			if (remainingStringWidth > desiredStringContinuationWidth)
 				desiredStringContinuationWidth = remainingStringWidth;
 		}
@@ -779,8 +780,7 @@ vector<DisassemblyTextLine> GenericLineFormatter::FormatLines(
 			{
 			case BraceToken:
 				// Beginning of string
-				if (tokenIndex + 1 < currentLine.tokens.size()
-					&& currentLine.tokens[tokenIndex + 1].type == StringToken)
+				if (trimmedText == "\"" && currentLine.tokens[tokenIndex + 1].type == StringToken)
 				{
 					// Create a ContainerContents item and place it onto the item stack. This will hold anything
 					// inside the container once the end of the container is found.
@@ -792,14 +792,18 @@ vector<DisassemblyTextLine> GenericLineFormatter::FormatLines(
 					items.push_back(Item {StartOfContainer, {}, {token}, 0});
 				}
 				// End of string
-				else if (currentLine.tokens[tokenIndex].type == StringToken
-					&& tokenIndex + 1 < currentLine.tokens.size()
-					&& currentLine.tokens[tokenIndex + 1].type == BraceToken)
+				else if (trimmedText == "\"" && currentLine.tokens[tokenIndex - 1].type == StringToken)
 				{
-					// Create a ContainerContents item and place it onto the item stack. This will hold anything
-					// inside the container once the end of the container is found.
-					items.push_back(Item {Container, {}, {}, 0});
-					itemStack.push(items);
+					items.push_back(Item {EndOfContainer, {}, {token}, 0});
+
+					if (itemStack.empty())
+						break;
+
+					// Go back up the item stack and add the items to the container
+					vector<Item> parent = itemStack.top();
+					itemStack.pop();
+					parent.back().items.insert(parent.back().items.end(), items.begin(), items.end());
+					items = parent;
 				}
 				else if (trimmedText == "(" || trimmedText == "[" || trimmedText == "{")
 				{