From c31af1c91e5bd5046a722447a1fd9ea9e0fd65de Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 4 May 2011 10:14:53 +0200 Subject: [PATCH] fix another possible source for OOME in VB formatting engine --- .../Src/FormattingStrategy/VBNetFormattingStrategy.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs index ccb599139f..0d313f33ae 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs @@ -719,7 +719,7 @@ namespace ICSharpCode.VBNetBinding Token currentToken = null; - while ((currentToken = lexer.Peek()).Kind != Tokens.EOL) { + while ((currentToken = lexer.Peek()).Kind > Tokens.EOL) { if (currentToken.Kind == Tokens.Then) return lexer.Peek().Kind == Tokens.EOL; } @@ -755,13 +755,13 @@ namespace ICSharpCode.VBNetBinding return false; } - if (current.Kind == Tokens.With && prev.Kind != Tokens.EOL) + if (current.Kind == Tokens.With && prev.Kind > Tokens.EOL) return false; if (current.Kind == Tokens.While && (prev.Kind == Tokens.Skip || prev.Kind == Tokens.Take)) return false; - if (current.Kind == Tokens.Select && prev.Kind != Tokens.EOL) + if (current.Kind == Tokens.Select && prev.Kind > Tokens.EOL) return false; if (current.Kind == Tokens.Class || current.Kind == Tokens.Structure) {