import java.util.Vector;
+import net.sourceforge.phpdt.internal.ui.text.java.JavaFormattingStrategy;
+import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCompletionProcessor;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.phpeditor.html.HTMLFormattingStrategy;
import net.sourceforge.phpeclipse.phpeditor.php.HTMLCompletionProcessor;
+import net.sourceforge.phpeclipse.phpeditor.php.IPHPPartitionScannerConstants;
import net.sourceforge.phpeclipse.phpeditor.php.PHPAutoIndentStrategy;
import net.sourceforge.phpeclipse.phpeditor.php.PHPCompletionProcessor;
import net.sourceforge.phpeclipse.phpeditor.php.PHPDoubleClickSelector;
-import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.TextAttribute;
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;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.DefaultPartitioner;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.source.IAnnotationHover;
import org.eclipse.jface.text.source.ISourceViewer;
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;
+
+ private PHPEditor fEditor;
+
+ private ContentFormatter fFormatter;
+ private HTMLFormattingStrategy fFormattingStrategy;
/**
* Single token scanner.
*/
/**
* Default constructor.
*/
- public PHPSourceViewerConfiguration() {
+ public PHPSourceViewerConfiguration(PHPEditor editor) {
+ fEditor = editor;
}
+ /*
+ * @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) {
+ //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.
+// * 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
+// */
+// private String[] getPartitionManagingPositionCategories() {
+// return new String[] { DefaultPartitioner.CONTENT_TYPES_CATEGORY };
+// }
+
+ public PHPEditor getEditor() {
+ return fEditor;
+ }
/* (non-Javadoc)
* Method declared on SourceViewerConfiguration
*/
return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? new PHPAutoIndentStrategy() : new DefaultAutoIndentStrategy());
}
- /* (non-Javadoc)
- * Method declared on SourceViewerConfiguration
- */
- public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
- return new String[] { IDocument.DEFAULT_CONTENT_TYPE, PHPPartitionScanner.PHP,
- // PHPPartitionScanner.JAVA_DOC,
- PHPPartitionScanner.HTML_MULTILINE_COMMENT };
+/* (non-Javadoc)
+ * Method declared on SourceViewerConfiguration
+ */
+public String[] getConfiguredContentTypes(ISourceViewer sourceViewer)
+{
+ return new String[] {
+ IDocument.DEFAULT_CONTENT_TYPE,
+ IPHPPartitionScannerConstants.PHP,
+ IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.HTML,
+ IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.CSS,
+ IPHPPartitionScannerConstants.CSS_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.JAVASCRIPT,
+ IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT
+ };
}
- /* (non-Javadoc)
+ /* (non-Javadoc)
* Method declared on SourceViewerConfiguration
*/
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
ContentAssistant assistant = new ContentAssistant();
assistant.setContentAssistProcessor(new HTMLCompletionProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
- assistant.setContentAssistProcessor(new PHPCompletionProcessor(), PHPPartitionScanner.PHP);
- //assistant.setContentAssistProcessor(new PHPCompletionProcessor(), PHPPartitionScanner.HTML);
-
+ assistant.setContentAssistProcessor(new PHPCompletionProcessor(), IPHPPartitionScannerConstants.PHP);
+ assistant.setContentAssistProcessor(new PHPDocCompletionProcessor(), IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT);
+
assistant.enableAutoActivation(true);
assistant.setAutoActivationDelay(500);
assistant.setProposalPopupOrientation(ContentAssistant.PROPOSAL_OVERLAY);
// reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPCodeScanner());
- reconciler.setDamager(dr, PHPPartitionScanner.PHP);
- reconciler.setRepairer(dr, PHPPartitionScanner.PHP);
+ reconciler.setDamager(dr, IPHPPartitionScannerConstants.PHP);
+ reconciler.setRepairer(dr, IPHPPartitionScannerConstants.PHP);
-// dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getHTMLCodeScanner());
-// reconciler.setDamager(dr, PHPPartitionScanner.HTML);
-// reconciler.setRepairer(dr, PHPPartitionScanner.HTML);
+ dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPDocCodeScanner());
+ reconciler.setDamager(dr, IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT);
+ reconciler.setRepairer(dr, IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT);
+
+ 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, PHPPartitionScanner.HTML_MULTILINE_COMMENT);
- reconciler.setRepairer(dr, PHPPartitionScanner.HTML_MULTILINE_COMMENT);
+ reconciler.setDamager(dr, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT);
+ reconciler.setRepairer(dr, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT);
return reconciler;
}
git://secure.phpeclipse.com / phpeclipse.git / blobdiff