X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
index e36147a..87a0289 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -48,11 +48,11 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.swt.graphics.RGB;
 
 /**
- * Configuration for an <code>SourceViewer</code> which shows PHP code.
+ * Configuration for an <code>SourceViewer</code> which shows PHP code. 
  */
 public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 
-  public static final String HTML_DEFAULT = IDocument.DEFAULT_CONTENT_TYPE;
+  public static final String HTML_DEFAULT = IPHPPartitionScannerConstants.HTML; //IDocument.DEFAULT_CONTENT_TYPE;
   
   private PHPEditor fEditor;
   
@@ -111,7 +111,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
   public String[] getPartitionManagingPositionCategories() {
     return new String[] { DefaultPartitioner.CONTENT_TYPES_CATEGORY };
   }
-//  /**
+//  /** 
 //   * Returns the names of the document position categories used by the document
 //   * partitioners created by this object to manage their partition information.
 //   * If the partitioners don't use document position categories, the returned
@@ -127,6 +127,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
   public PHPEditor getEditor() {
     return fEditor;
   }
+  
   /* (non-Javadoc)
    * Method declared on SourceViewerConfiguration
    */
@@ -147,7 +148,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 public String[] getConfiguredContentTypes(ISourceViewer sourceViewer)
 {
     return new String[] {
-        IDocument.DEFAULT_CONTENT_TYPE,
+    	IDocument.DEFAULT_CONTENT_TYPE,
         IPHPPartitionScannerConstants.PHP,
         IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
         IPHPPartitionScannerConstants.HTML,
@@ -159,7 +160,7 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer)
         };
   }
 
-  /* (non-Javadoc)
+  /* (non-Javadoc) 
    * Method declared on SourceViewerConfiguration
    */
   public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
@@ -262,7 +263,7 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer)
 //    reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
 //    reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
 
-    dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPCodeScanner());
+	dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPCodeScanner());
     reconciler.setDamager(dr, IPHPPartitionScannerConstants.PHP);
     reconciler.setRepairer(dr, IPHPPartitionScannerConstants.PHP);
 
@@ -270,9 +271,9 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer)
     reconciler.setDamager(dr, IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT);
     reconciler.setRepairer(dr, IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT);
     
-//    dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getHTMLCodeScanner());
-//    reconciler.setDamager(dr, PHPPartitionScanner.HTML);
-//    reconciler.setRepairer(dr, PHPPartitionScanner.HTML);
+    dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getHTMLCodeScanner());
+    reconciler.setDamager(dr, IPHPPartitionScannerConstants.HTML);
+    reconciler.setRepairer(dr, IPHPPartitionScannerConstants.HTML);
 
     dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(PHPColorProvider.MULTI_LINE_COMMENT))));
     reconciler.setDamager(dr, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT);