From 97dcfef0aeb5af4e95ee039f237d678863a8ec65 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Thu, 2 Jun 2022 11:40:22 +0200 Subject: [PATCH] Adresses #149130 by not causing and endless-loop when token end-offsets are not sorted. --- .../bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts index 0e7381b7677..7cfe9631770 100644 --- a/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts +++ b/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts @@ -199,7 +199,7 @@ class NonPeekableTextBufferTokenizer { const endOffset = lineTokens.getEndOffset(this.lineTokenOffset); // Is there a bracket token next? Only consume text. - if (containsBracketType && isOther && endOffset !== this.lineCharOffset) { + if (containsBracketType && isOther && this.lineCharOffset < endOffset) { const languageId = lineTokens.getLanguageId(this.lineTokenOffset); const text = this.line.substring(this.lineCharOffset, endOffset);