Merge pull request #59011 from dotnet/merges/release/dev17.1-to-relea…

…se/dev17.1-vs-deps Merge release/dev17.1 to release/dev17.1-vs-deps
dotnet · Jan 22, 2022 · 663228d · 663228d
2 parents 426162e + a9b08d1
commit 663228d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Workspaces/Core/Portable/Classification/ClassifierHelper.cs b/src/Workspaces/Core/Portable/Classification/ClassifierHelper.cs
@@ -137,8 +137,10 @@ private static void AdjustSpans(ArrayBuilder<ClassifiedSpan> spans, TextSpan wid
 
                 if (i > 0 && intersection != null)
                 {
-                    var isAdditiveClassification = spans[i - 1].TextSpan == span.TextSpan &&
-                        ClassificationTypeNames.AdditiveTypeNames.Contains(span.ClassificationType);
+                    // The additiveType's may appear before or after their modifier due to sorting.
+                    var previousSpan = spans[i - 1];
+                    var isAdditiveClassification = previousSpan.TextSpan == span.TextSpan &&
+                        ClassificationTypeNames.AdditiveTypeNames.Contains(span.ClassificationType) || ClassificationTypeNames.AdditiveTypeNames.Contains(previousSpan.ClassificationType);
 
                     // Additive classifications are intended to overlap so do not ignore it.
                     if (!isAdditiveClassification && spans[i - 1].TextSpan.End > intersection.Value.Start)