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 87a0289..9fbe169 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java @@ -13,8 +13,10 @@ package net.sourceforge.phpeclipse.phpeditor; import java.util.Vector; +import net.sourceforge.phpdt.internal.ui.text.JavaColorManager; import net.sourceforge.phpdt.internal.ui.text.java.JavaFormattingStrategy; import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCompletionProcessor; +import net.sourceforge.phpdt.ui.text.JavaTextTools; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.phpeditor.html.HTMLFormattingStrategy; import net.sourceforge.phpeclipse.phpeditor.php.HTMLCompletionProcessor; @@ -52,10 +54,12 @@ import org.eclipse.swt.graphics.RGB; */ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration { - public static final String HTML_DEFAULT = IPHPPartitionScannerConstants.HTML; //IDocument.DEFAULT_CONTENT_TYPE; - + public static final String HTML_DEFAULT = IPHPPartitionScannerConstants.HTML; + //IDocument.DEFAULT_CONTENT_TYPE; + + private JavaTextTools fJavaTextTools; private PHPEditor fEditor; - + private ContentFormatter fFormatter; private HTMLFormattingStrategy fFormattingStrategy; /** @@ -70,7 +74,8 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration { /** * Default constructor. */ - public PHPSourceViewerConfiguration(PHPEditor editor) { + public PHPSourceViewerConfiguration(JavaTextTools textTools, PHPEditor editor) { + fJavaTextTools = textTools; fEditor = editor; } @@ -78,27 +83,30 @@ 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)); + // } + // 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()); + //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. @@ -111,23 +119,23 @@ 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 -// * result is null. -// * -// * @return the partition managing position categories or null -// * if there is none -// */ -// private 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 null. + // * + // * @return the partition managing position categories or null + // * 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 */ @@ -138,26 +146,29 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration { /* (non-Javadoc) * Method declared on SourceViewerConfiguration */ - public IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) { - return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? new PHPAutoIndentStrategy() : new DefaultAutoIndentStrategy()); + public IAutoIndentStrategy getAutoIndentStrategy( + ISourceViewer sourceViewer, + String contentType) { + return ( + IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) + ? new PHPAutoIndentStrategy() + : new DefaultAutoIndentStrategy()); } -/* (non-Javadoc) - * Method declared on SourceViewerConfiguration - */ -public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) -{ + /* (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 - }; + 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) @@ -166,15 +177,24 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ContentAssistant assistant = new ContentAssistant(); - assistant.setContentAssistProcessor(new HTMLCompletionProcessor(), IDocument.DEFAULT_CONTENT_TYPE); - assistant.setContentAssistProcessor(new PHPCompletionProcessor(), IPHPPartitionScannerConstants.PHP); - assistant.setContentAssistProcessor(new PHPDocCompletionProcessor(), IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT); - + assistant.setContentAssistProcessor( + new HTMLCompletionProcessor(), + IDocument.DEFAULT_CONTENT_TYPE); + 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); - assistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE); - assistant.setContextInformationPopupBackground(PHPEditorEnvironment.getPHPColorProvider().getColor(new RGB(150, 150, 0))); + assistant.setContextInformationPopupOrientation( + ContentAssistant.CONTEXT_INFO_ABOVE); + assistant.setContextInformationPopupBackground( + PHPEditorEnvironment.getPHPColorProvider().getColor( + new RGB(150, 150, 0))); return assistant; } @@ -182,69 +202,76 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) /* (non-Javadoc) * Method declared on SourceViewerConfiguration */ -// public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) { -// return (PHPPartitionScanner.PHP.equals(contentType) ? "//" : null); //$NON-NLS-1$ -// // return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? "//" : null); //$NON-NLS-1$ -// } + // public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) { + // return (PHPPartitionScanner.PHP.equals(contentType) ? "//" : null); //$NON-NLS-1$ + // // return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? "//" : null); //$NON-NLS-1$ + // } /* * @see SourceViewerConfiguration#getDefaultPrefix(ISourceViewer, String) * @since 2.0 */ - public String[] getDefaultPrefixes(ISourceViewer sourceViewer, String contentType) { + public String[] getDefaultPrefixes( + ISourceViewer sourceViewer, + String contentType) { return new String[] { "//", "" }; //$NON-NLS-1$ //$NON-NLS-2$ } - + /* (non-Javadoc) * Method declared on SourceViewerConfiguration */ - public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) { + public ITextDoubleClickStrategy getDoubleClickStrategy( + ISourceViewer sourceViewer, + String contentType) { return new PHPDoubleClickSelector(); } /* (non-Javadoc) * Method declared on SourceViewerConfiguration */ -// public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { -// return new String[] { "\t", " " }; //$NON-NLS-1$ //$NON-NLS-2$ -// } + // public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { + // return new String[] { "\t", " " }; //$NON-NLS-1$ //$NON-NLS-2$ + // } /* * @see SourceViewerConfiguration#getIndentPrefixes(ISourceViewer, String) */ - public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { + public String[] getIndentPrefixes( + ISourceViewer sourceViewer, + String contentType) { - Vector vector= new Vector(); + Vector vector = new Vector(); // prefix[0] is either '\t' or ' ' x tabWidth, depending on useSpaces - - final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); - int tabWidth= store.getInt(PHPeclipsePlugin.FORMATTER_TAB_SIZE); - boolean useSpaces= store.getBoolean(PHPeclipsePlugin.SPACES_FOR_TABS); - - for (int i= 0; i <= tabWidth; i++) { - StringBuffer prefix= new StringBuffer(); + final IPreferenceStore store = + PHPeclipsePlugin.getDefault().getPreferenceStore(); + + int tabWidth = store.getInt(PHPeclipsePlugin.FORMATTER_TAB_SIZE); + boolean useSpaces = store.getBoolean(PHPeclipsePlugin.SPACES_FOR_TABS); + + for (int i = 0; i <= tabWidth; i++) { + StringBuffer prefix = new StringBuffer(); if (useSpaces) { - for (int j= 0; j + i < tabWidth; j++) - prefix.append(' '); - + for (int j = 0; j + i < tabWidth; j++) + prefix.append(' '); + if (i != 0) - prefix.append('\t'); - } else { - for (int j= 0; j < i; j++) - prefix.append(' '); - + prefix.append('\t'); + } else { + for (int j = 0; j < i; j++) + prefix.append(' '); + if (i != tabWidth) - prefix.append('\t'); + prefix.append('\t'); } - + vector.add(prefix.toString()); } vector.add(""); //$NON-NLS-1$ - + return (String[]) vector.toArray(new String[vector.size()]); } /* (non-Javadoc) @@ -252,32 +279,47 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) */ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { - PHPColorProvider provider = PHPEditorEnvironment.getPHPColorProvider(); + // PHPColorProvider provider = PHPEditorEnvironment.getPHPColorProvider(); + JavaColorManager provider = PHPEditorEnvironment.getPHPColorProvider(); PresentationReconciler reconciler = new PresentationReconciler(); - - DefaultDamagerRepairer dr= new DefaultDamagerRepairer(PHPEditorEnvironment.getHTMLCodeScanner()); + + DefaultDamagerRepairer dr = + new DefaultDamagerRepairer(PHPEditorEnvironment.getHTMLCodeScanner()); reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); - -// dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.HTML_DEFAULT)))); -// reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); -// reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); - dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPCodeScanner()); + // dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.HTML_DEFAULT)))); + // reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); + // reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); + + dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPCodeScanner()); reconciler.setDamager(dr, IPHPPartitionScannerConstants.PHP); reconciler.setRepairer(dr, IPHPPartitionScannerConstants.PHP); - dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getPHPDocCodeScanner()); - reconciler.setDamager(dr, IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT); - reconciler.setRepairer(dr, IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT); - + 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, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT); - reconciler.setRepairer(dr, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT); + dr = + new DefaultDamagerRepairer( + new SingleTokenScanner( + new TextAttribute( + provider.getColor(PHPColorProvider.MULTI_LINE_COMMENT)))); + reconciler.setDamager( + dr, + IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT); + reconciler.setRepairer( + dr, + IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT); return reconciler; } @@ -292,7 +334,9 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) /* (non-Javadoc) * Method declared on SourceViewerConfiguration */ - public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) { + public ITextHover getTextHover( + ISourceViewer sourceViewer, + String contentType) { return new PHPTextHover(); } }