Merge pull request #3091 from Microsoft/classificationLoop

Prevent infinite loop when classifying.
This commit is contained in:
CyrusNajmabadi 2015-05-08 12:54:05 -07:00
commit 5aed73ff72

View File

@ -6039,11 +6039,13 @@ module ts {
let end = triviaScanner.getTextPos();
let width = end - start;
if (textSpanIntersectsWith(span, start, width)) {
if (!isTrivia(kind)) {
return;
}
// The moment we get something that isn't trivia, then stop processing.
if (!isTrivia(kind)) {
return;
}
// Only bother with the trivia if it at least intersects the span of interest.
if (textSpanIntersectsWith(span, start, width)) {
if (isComment(kind)) {
// Simple comment. Just add as is.
pushClassification(start, width, ClassificationType.comment);