Merge pull request #12655 from unoplatform/Youssef1313/parser-cancell…

…ation perf: Proper cancellation for XamlFileParser
unoplatform · Jun 21, 2023 · 2eb2b28 · 2eb2b28
2 parents 1111f3c + 463d921
commit 2eb2b28
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileParser.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileParser.cs
@@ -118,7 +118,7 @@ private static void ScavengeCache()
 					{
 						cancellationToken.ThrowIfCancellationRequested();
 
-						var xamlFileDefinition = Visit(reader, file.Path, targetFilePath);
+						var xamlFileDefinition = Visit(reader, file.Path, targetFilePath, cancellationToken);
 						if (!reader.DisableCaching)
 						{
 							_cachedFiles[cachedFileKey] = new CachedFile(DateTimeOffset.Now, xamlFileDefinition);
@@ -224,14 +224,15 @@ private XmlReader RewriteForXBind(SourceText sourceText)
 			}
 		}
 
-		private XamlFileDefinition Visit(XamlXmlReader reader, string file, string targetFilePath)
+		private XamlFileDefinition Visit(XamlXmlReader reader, string file, string targetFilePath, CancellationToken cancellationToken)
 		{
 			WriteState(reader);
 
 			var xamlFile = new XamlFileDefinition(file, targetFilePath);
 
 			do
 			{
+				cancellationToken.ThrowIfCancellationRequested();
 				switch (reader.NodeType)
 				{
 					case XamlNodeType.StartObject: