From 8d0abf1538d738560840d0946adb1b301165a159 Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 10 Jul 2008 00:11:03 +0400 Subject: [PATCH] sql lexer impros: ${} support + 314ident's support --- .../src/com/intellij/lang/pratt/MutableMarker.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lang-impl/src/com/intellij/lang/pratt/MutableMarker.java b/lang-impl/src/com/intellij/lang/pratt/MutableMarker.java index 830804de02..b7506c3620 100644 --- a/lang-impl/src/com/intellij/lang/pratt/MutableMarker.java +++ b/lang-impl/src/com/intellij/lang/pratt/MutableMarker.java @@ -54,15 +54,17 @@ public class MutableMarker { } public void finish() { - assert myMode == Mode.READY || myMode == Mode.DROPPED && myResultType == null: myMode; - if (myResultType == null) { - myMode = Mode.DROPPED; - myStartMarker.drop(); - } else { - myMode = Mode.COMMITTED; - myStartMarker.done(myResultType); - restorePath(); - myPath.addLast(myResultType); + if (myMode == Mode.READY) { + if (myResultType == null) { + myMode = Mode.DROPPED; + myStartMarker.drop(); + } + else { + myMode = Mode.COMMITTED; + myStartMarker.done(myResultType); + restorePath(); + myPath.addLast(myResultType); + } } } -- 2.11.4.GIT