WIP (41)

Author: sdottaka

src/WinWebDiffLib/DiffHighlighter.hpp

@@ -706,8 +706,6 @@ class Highlighter
 					className += deleted ? L" wwd-deleted" : L" wwd-changed";
 				auto& allocator = m_documents[pane].GetAllocator();
 				std::wstring orgtext;
-				if (diffInfo.nodePos[pane] == 0)
-					orgtext = textBlocks[pane].textBlocks;
 				if (diffInfo.nodePos[pane] == 0)
 				{
 					if (diffInfo.nodeTypes[pane] == 1 /* ELEMENT_NODE */)
@@ -719,7 +717,7 @@ class Highlighter
 					{
 						WValue spanNode, attributes, children;
 						attributes.SetArray();
-						appendAttributes(attributes, className, i, orgtext, allocator);
+						appendAttributes(attributes, className, i, textBlocks[pane].textBlocks, allocator);
 						spanNode.SetObject();
 						spanNode.AddMember(L"nodeName", L"SPAN", allocator);
 						spanNode.AddMember(L"attributes", attributes, allocator);
@@ -748,7 +746,7 @@ class Highlighter
 				{
 					WValue spanNode, attributes, children;
 					attributes.SetArray();
-					appendAttributes(attributes, className, i, orgtext, allocator);
+					appendAttributes(attributes, className, i, L"", allocator);
 					spanNode.SetObject();
 					spanNode.AddMember(L"nodeName", L"SPAN", allocator);
 					spanNode.AddMember(L"attributes", attributes, allocator);
@@ -1151,8 +1149,8 @@ class Highlighter
 		const auto& ary = value[L"attributes"].GetArray();
 		for (unsigned int i = 0; i + 1 < ary.Size(); i += 2)
 		{
-			if (wcscmp(ary[i].GetString(), L"class") == 0 ||
-			    wcsstr(ary[i].GetString(), name) != nullptr)
+			if (wcscmp(ary[i].GetString(), L"class") == 0 && 
+			    wcsstr(ary[i + 1].GetString(), name) != nullptr)
 				return true;
 		}
 		return false;

src/WinWebDiffLib/WebDiffWindow.hpp

@@ -740,6 +740,16 @@ LR"(
 						{
 							Highlighter highlighter(*documents.get(), m_diffInfos, m_colorSettings, m_diffOptions, m_bShowWordDifferences, m_currentDiffIndex);
 							highlighter.highlightNodes();
+#ifdef _DEBUG
+							for (int pane = 0; pane < m_nPanes; ++pane)
+							{
+								WStringBuffer buffer;
+								WPrettyWriter writer(buffer);
+								(*documents)[pane].Accept(writer);
+								WriteToTextFile((L"c:\\tmp\\file" + std::to_wstring(pane) + L"_1.json"),
+									buffer.GetString());
+							}
+#endif
 						}
 						hr = highlightDocuments(documents,
 							Callback<IWebDiffCallback>([this, callback2](const WebDiffCallbackResult& result) -> HRESULT
@@ -936,6 +946,14 @@ LR"(
 					{
 						WDocument doc;
 						doc.Parse(result.returnObjectAsJson);
+#ifdef _DEBUG
+						WStringBuffer buffer;
+						WPrettyWriter writer(buffer);
+						doc.Accept(writer);
+						WriteToTextFile((L"c:\\tmp\\file" + std::to_wstring(pane) + L"_2.json"),
+							buffer.GetString());
+#endif
+
 						std::map<int, int> nodes;
 						Highlighter::getDiffNodes(doc[L"root"], nodes);
 						for (unsigned i = 0; i < m_diffInfos.size(); ++i)