unification of bug fixes 1198893, 1404228

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / FastJavaPartitionScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
index 7efcc30..d9e8c7f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
@@ -201,8 +201,12 @@ public class FastJavaPartitionScanner implements IPartitionTokenScanner, IPHPPar
                                                fScanner.unread();
                                                return postFix(fState);
                                        }
-                                       // bug #1404228: Crash on <?php // comment ?>
-                                       // fScanner.unread();
+                                       else {
+                                               // bug #1404228: Crash on <?php // comment ?>
+                                               if (nextch!=ICharacterScanner.EOF) {
+                                                       fScanner.unread();
+                                               }
+                                       }
                                }
 
                        default: