Codeformatter preferences should work now

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPDocumentProvider.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
index 07af3cd..198ad1f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
@@ -12,13 +12,14 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
+import net.sourceforge.phpeclipse.phpeditor.php.IPHPPartitionScannerConstants;
+import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.RuleBasedPartitioner;
 import org.eclipse.ui.editors.text.FileDocumentProvider;
-import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
 
 /** 
  * The PHPDocumentProvider provides the IDocuments used by java editors.
@@ -28,9 +29,12 @@ public class PHPDocumentProvider extends FileDocumentProvider {
 
   // private final static String[] TYPES= new String[] { PHPPartitionScanner.PHP, PHPPartitionScanner.JAVA_DOC, PHPPartitionScanner.JAVA_MULTILINE_COMMENT };
   private final static String[] TYPES = new String[] { 
-    PHPPartitionScanner.PHP,
-//    PHPPartitionScanner.HTML, 
-    PHPPartitionScanner.HTML_MULTILINE_COMMENT };
+       IPHPPartitionScannerConstants.PHP,
+       IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
+    IPHPPartitionScannerConstants.HTML, 
+       IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT,
+       IPHPPartitionScannerConstants.JAVASCRIPT,
+       IPHPPartitionScannerConstants.CSS};
 
   private static PHPPartitionScanner fgScanner = null;