Fixed possible behavior issues around combining characters.

NoahRic · Mar 1, 2010 · c4350aa · c4350aa
1 parent 5ce88e2
commit c4350aa
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/CommandFilter.cs b/CommandFilter.cs
@@ -177,6 +177,16 @@ private ColumnAndOffset GetColumnNumberOfFirstEquals(ITextSnapshotLine line)
                     column += tabSize - (column % tabSize);
                 else
                     column++;
+
+                // Also, check to see if this is a surrogate pair.  If so, skip the next character by incrementing
+                // the loop counter and increment the nonWhiteSpaceCount without incrementing the column
+                // count.
+                if (char.IsHighSurrogate(ch) &&
+                    i < line.End.Position - 1 && char.IsLowSurrogate(snapshot[i + 1]))
+                {
+                    nonWhiteSpaceCount++;
+                    i++;
+                }
             }
 
             return new ColumnAndOffset() { Column = -1, Offset = -1 };