*** empty log message ***

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / PHPPartitionScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
index 35d5208..2cb2eb9 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
@@ -6,7 +6,7 @@
  * Created on 05.03.2003
  *
  * @author Stefan Langer (musk)
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
  */
 package net.sourceforge.phpeclipse.phpeditor.php;
 
@@ -51,9 +51,10 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
   
   public PHPPartitionScanner(int fileType) {
     this.tokens.put(IPHPPartitions.PHP_PARTITIONING, new Token(IPHPPartitions.PHP_PARTITIONING));
+    this.tokens.put(IPHPPartitions.PHP_STRING_DQ, new Token(IPHPPartitions.PHP_STRING_DQ));
     this.tokens.put(
-      IPHPPartitions.PHP_MULTILINE_COMMENT,
-      new Token(IPHPPartitions.PHP_MULTILINE_COMMENT));
+      IPHPPartitions.PHP_PHPDOC_COMMENT,
+      new Token(IPHPPartitions.PHP_PHPDOC_COMMENT));
     this.tokens.put(IPHPPartitions.HTML, new Token(IPHPPartitions.HTML));
     this.tokens.put(
       IPHPPartitions.HTML_MULTILINE_COMMENT,
@@ -161,7 +162,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
       switch (c) {
         case '<' :
           if (!isInString(IPHPPartitions.PHP_PARTITIONING)
-            && fContentType != IPHPPartitions.PHP_MULTILINE_COMMENT
+            && fContentType != IPHPPartitions.PHP_PHPDOC_COMMENT
             && checkPattern(new char[] { '?', 'p', 'h', 'p' }, true)) {
             if (fContentType != IPHPPartitions.PHP_PARTITIONING && fCurrentLength > 5) {
               unread(5);
@@ -181,7 +182,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
             fCurrentLength = 5;
           } else if (
             !isInString(IPHPPartitions.PHP_PARTITIONING)
-              && fContentType != IPHPPartitions.PHP_MULTILINE_COMMENT
+              && fContentType != IPHPPartitions.PHP_PHPDOC_COMMENT
               && checkPattern(new char[] { '?' }, false)) {
             if (fContentType != IPHPPartitions.PHP_PARTITIONING && fCurrentLength > 2) {
               unread(2);
@@ -198,7 +199,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
           } else if (
             !isInString(IPHPPartitions.PHP_PARTITIONING)
               && (fContentType != IPHPPartitions.PHP_PARTITIONING) // BUG #769044
-              && (fContentType != IPHPPartitions.PHP_MULTILINE_COMMENT) // BUG #769044
+              && (fContentType != IPHPPartitions.PHP_PHPDOC_COMMENT) // BUG #769044
               && checkPattern(new char[] { '!', '-', '-' })) { // return previouse partition
             if (fContentType != IPHPPartitions.HTML_MULTILINE_COMMENT && fCurrentLength > 4) {
               unread(4);
@@ -316,9 +317,9 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
             if (fContentType == IPHPPartitions.PHP_PARTITIONING && fCurrentLength > 2) {
               unread(2);
               IToken token = getToken(fContentType);
-              fContentType = IPHPPartitions.PHP_MULTILINE_COMMENT;
+              fContentType = IPHPPartitions.PHP_PHPDOC_COMMENT;
               return token;
-            } else if (fContentType == IPHPPartitions.PHP_MULTILINE_COMMENT) {
+            } else if (fContentType == IPHPPartitions.PHP_PHPDOC_COMMENT) {
               fTokenOffset = fOffset - 2;
               fCurrentLength = 2;
             }
@@ -328,10 +329,10 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
           break;
         case '*' :
           if (!isInString(IPHPPartitions.PHP_PARTITIONING) && (c = read()) == '/') {
-            if (fContentType == IPHPPartitions.PHP_MULTILINE_COMMENT) {
+            if (fContentType == IPHPPartitions.PHP_PHPDOC_COMMENT) {
               fContentType = IPHPPartitions.PHP_PARTITIONING;
               partitionBorder = true;
-              return getToken(IPHPPartitions.PHP_MULTILINE_COMMENT);
+              return getToken(IPHPPartitions.PHP_PHPDOC_COMMENT);
             } else if (fContentType == IPHPPartitions.CSS_MULTILINE_COMMENT) {
             } else if (fContentType == IPHPPartitions.JS_MULTILINE_COMMENT) {
             }