bug fix 1403993, scanner wrongly detected XML comment end, when closing > was still...

diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/PHPXMLPartitionScanner.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/PHPXMLPartitionScanner.java
index 37946aa..86cd4f1 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/PHPXMLPartitionScanner.java
+++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/PHPXMLPartitionScanner.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: PHPXMLPartitionScanner.java,v 1.1 2005-05-15 23:23:02 axelcl Exp $
+ * $Id: PHPXMLPartitionScanner.java,v 1.2 2006-01-15 12:24:16 bananeweizen Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
@@ -26,8 +26,8 @@ import org.eclipse.jface.text.rules.Token;
 
 
 /**
- * 
- * 
+ *
+ *
  * @author Igor Malinin
  */
 public class PHPXMLPartitionScanner implements IPartitionTokenScanner {
@@ -100,10 +100,10 @@ public class PHPXMLPartitionScanner implements IPartitionTokenScanner {
                                                state = STATE_DEFAULT;
                                                return getToken(XML_TAG);
 
-                                       case '?': // <?  <?PI 
+                                       case '?': // <?  <?PI
                                            unread();
                                            break;
-//                                             return nextPIToken(); 
+//                                             return nextPIToken();
 
                                        case '!': // <!  <!DEFINITION or <![CDATA[ or <!--COMMENT
                                                switch (read()) {
@@ -310,7 +310,7 @@ loop:
                                                        }
 
                                                        unread();
-                                                       break loop;
+                                                       continue loop;
                                        }
                        }
                }

diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLPartitionScanner.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLPartitionScanner.java
index c74cc32..fd44b54 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLPartitionScanner.java
+++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLPartitionScanner.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLPartitionScanner.java,v 1.3 2005-05-15 23:23:02 axelcl Exp $
+ * $Id: XMLPartitionScanner.java,v 1.4 2006-01-15 12:24:16 bananeweizen Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
@@ -26,8 +26,8 @@ import org.eclipse.jface.text.rules.Token;
 
 
 /**
- * 
- * 
+ *
+ *
  * @author Igor Malinin
  */
 public class XMLPartitionScanner implements IPartitionTokenScanner {
@@ -100,8 +100,8 @@ public class XMLPartitionScanner implements IPartitionTokenScanner {
                                                state = STATE_DEFAULT;
                                                return getToken(XML_TAG);
 
-                                       case '?': // <?  <?PI 
-                                               return nextPIToken(); 
+                                       case '?': // <?  <?PI
+                                               return nextPIToken();
 
                                        case '!': // <!  <!DEFINITION or <![CDATA[ or <!--COMMENT
                                                switch (read()) {
@@ -308,7 +308,7 @@ loop:
                                                        }
 
                                                        unread();
-                                                       break loop;
+                                                       continue loop;
                                        }
                        }
                }