php formatter based on the JDT java formatter (very early version)

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

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 af8b262..09662be 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -13,6 +13,7 @@ package net.sourceforge.phpeclipse.phpeditor;
 
 import java.util.Vector;
 
+import net.sourceforge.phpdt.internal.ui.text.java.JavaFormattingStrategy;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.html.HTMLFormattingStrategy;
 import net.sourceforge.phpeclipse.phpeditor.php.HTMLCompletionProcessor;
@@ -33,6 +34,7 @@ import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
 import org.eclipse.jface.text.formatter.ContentFormatter;
 import org.eclipse.jface.text.formatter.IContentFormatter;
+import org.eclipse.jface.text.formatter.IFormattingStrategy;
 import org.eclipse.jface.text.presentation.IPresentationReconciler;
 import org.eclipse.jface.text.presentation.PresentationReconciler;
 import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
@@ -75,16 +77,39 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
    * @see SourceViewerConfiguration#getContentFormatter(ISourceViewer)
    */
   public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
+//    if (fFormatter == null) {
+//      fFormatter = new ContentFormatter();
+//      fFormattingStrategy = new HTMLFormattingStrategy(this, sourceViewer);
+//      fFormatter.setFormattingStrategy(fFormattingStrategy, HTML_DEFAULT);
+//      fFormatter.enablePartitionAwareFormatting(false);
+//      fFormatter.setPartitionManagingPositionCategories(getConfiguredContentTypes(null));
+//    }
+//    return fFormatter;
+    
     if (fFormatter == null) {
-      fFormatter = new ContentFormatter();
-      fFormattingStrategy = new HTMLFormattingStrategy(this, sourceViewer);
-      fFormatter.setFormattingStrategy(fFormattingStrategy, HTML_DEFAULT);
-      fFormatter.enablePartitionAwareFormatting(false);
-      fFormatter.setPartitionManagingPositionCategories(getConfiguredContentTypes(null));
+    //ContentFormatter 
+    fFormatter= new ContentFormatter();
+    IFormattingStrategy strategy= new JavaFormattingStrategy(sourceViewer);
+               
+    fFormatter.setFormattingStrategy(strategy, IDocument.DEFAULT_CONTENT_TYPE);
+    fFormatter.enablePartitionAwareFormatting(false);          
+    fFormatter.setPartitionManagingPositionCategories(getPartitionManagingPositionCategories());
     }
     return fFormatter;
   }
   
+  /**
+   * 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
+   * result is <code>null</code>.
+   *
+   * @return the partition managing position categories or <code>null</code> 
+   *                   if there is none
+   */
+  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.