Surround wrapped inline strings with bracetokens

Author: spoonmilk

formatter/generic/genericformatter.cpp

@@ -276,6 +276,7 @@ static vector<InstructionTextToken> ParseStringToken(
 	// Max parsing length set to max annotation length
     if (tail > maxParsingLength)
         return { unprocessedStringToken };
+
     vector<InstructionTextToken> result;
     size_t curStart = 0, curEnd = 0;
 
@@ -939,13 +940,15 @@ vector<DisassemblyTextLine> GenericLineFormatter::FormatLines(
 		stack<ItemLayoutStackEntry> layoutStack;
 		layoutStack.push({items, additionalContinuationIndentation, desiredWidth, desiredContinuationWidth, desiredStringWidth, false});
 
-		auto newLine = [&]() {
+		auto newLine = [&](bool forString = false) {
 			if (!firstTokenOfLine)
 			{
 				string lastTokenText = outputLine.tokens.back().text;
 				string trimmedText = TrimTrailingWhitespace(lastTokenText);
 				outputLine.tokens.back().width -= lastTokenText.size() - trimmedText.size();
 				outputLine.tokens.back().text = trimmedText;
+				if (forString)
+					outputLine.tokens.emplace_back(BraceToken, "\"");
 			}
 
 			result.push_back(outputLine);
@@ -960,6 +963,8 @@ vector<DisassemblyTextLine> GenericLineFormatter::FormatLines(
 			}
 
 			outputLine.tokens.emplace_back(TextToken, string(additionalContinuationIndentation, ' '));
+			if (forString)
+				outputLine.tokens.emplace_back(BraceToken, "\"");
 			currentWidth = 0;
 			desiredWidth = desiredContinuationWidth;
 			firstTokenOfLine = true;
@@ -987,8 +992,7 @@ vector<DisassemblyTextLine> GenericLineFormatter::FormatLines(
 				{
 					// If a string is too wide to fit on the current line, create a newline
 					// without additional indentation
-					LogError("Line length vs. desired %zu vs %zu", currentWidth + item->width, desiredStringWidth);
-					newLine();
+					newLine(true);
 					continue;
 				}
 				if (currentWidth + item->width > desiredWidth && item->type != StringWhitespace && item->type != StringComponent)