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 c8e1090..7406714 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -14,7 +14,8 @@ package net.sourceforge.phpeclipse.phpeditor;
import java.util.Vector;
import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
-import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
+import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
+import net.sourceforge.phpdt.internal.ui.text.PHPAnnotationHover;
import net.sourceforge.phpdt.internal.ui.text.java.JavaFormattingStrategy;
import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCompletionProcessor;
import net.sourceforge.phpdt.ui.PreferenceConstants;
@@ -29,10 +30,14 @@ import net.sourceforge.phpeclipse.phpeditor.php.PHPCompletionProcessor;
import net.sourceforge.phpeclipse.phpeditor.php.PHPDoubleClickSelector;
import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.DefaultAutoIndentStrategy;
+import org.eclipse.jface.text.DefaultInformationControl;
import org.eclipse.jface.text.IAutoIndentStrategy;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.TextAttribute;
@@ -52,28 +57,30 @@ import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.source.IAnnotationHover;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
/**
* Configuration for an SourceViewer which shows PHP code.
*/
public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
-
/**
* Preference key used to look up display tab width.
*
* @since 2.0
*/
- public final static String PREFERENCE_TAB_WIDTH= PreferenceConstants.EDITOR_TAB_WIDTH;
+ public final static String PREFERENCE_TAB_WIDTH = PreferenceConstants.EDITOR_TAB_WIDTH;
/**
* Preference key for inserting spaces rather than tabs.
*
* @since 2.0
*/
- public final static String SPACES_FOR_TABS= PreferenceConstants.EDITOR_SPACES_FOR_TABS;
-
+ public final static String SPACES_FOR_TABS = PreferenceConstants.EDITOR_SPACES_FOR_TABS;
-// public static final String HTML_DEFAULT = IPHPPartitionScannerConstants.HTML;
+ // public static final String HTML_DEFAULT = IPHPPartitionScannerConstants.HTML;
//IDocument.DEFAULT_CONTENT_TYPE;
private JavaTextTools fJavaTextTools;
@@ -164,8 +171,14 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
return PHPeclipsePlugin.getDefault().getPreferenceStore();
}
- /* (non-Javadoc)
- * Method declared on SourceViewerConfiguration
+ // /* (non-Javadoc)
+ // * Method declared on SourceViewerConfiguration
+ // */
+ // public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+ // return new PHPAnnotationHover();
+ // }
+ /*
+ * @see SourceViewerConfiguration#getAnnotationHover(ISourceViewer)
*/
public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
return new PHPAnnotationHover();
@@ -186,7 +199,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
protected RuleBasedScanner getCodeScanner() {
return fJavaTextTools.getCodeScanner();
}
-
+
/**
* Returns the HTML source code scanner for this configuration.
*
@@ -195,7 +208,26 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
protected RuleBasedScanner getHTMLScanner() {
return fJavaTextTools.getHTMLScanner();
}
-
+
+ /**
+ * Returns the Smarty source code scanner for this configuration.
+ *
+ * @return the Smarty source code scanner
+ */
+ protected RuleBasedScanner getSmartyScanner() {
+ return fJavaTextTools.getSmartyScanner();
+ }
+
+ /**
+ * Returns the SmartyDoc source code scanner for this configuration.
+ *
+ * @return the SmartyDoc source code scanner
+ */
+ protected RuleBasedScanner getSmartyDocScanner() {
+ return fJavaTextTools.getSmartyDocScanner();
+ }
+
+
/**
* Returns the PHPDoc source code scanner for this configuration.
*
@@ -204,20 +236,22 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
protected RuleBasedScanner getPHPDocScanner() {
return fJavaTextTools.getJavaDocScanner();
}
-
+
/* (non-Javadoc)
* Method declared on SourceViewerConfiguration
*/
public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
return new String[] {
IPHPPartitionScannerConstants.HTML,
- IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT,
- IPHPPartitionScannerConstants.PHP,
- IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
- IPHPPartitionScannerConstants.CSS,
- IPHPPartitionScannerConstants.CSS_MULTILINE_COMMENT,
- IPHPPartitionScannerConstants.JAVASCRIPT,
- IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.PHP,
+ IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.CSS,
+ IPHPPartitionScannerConstants.CSS_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.JAVASCRIPT,
+ IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT,
+ IPHPPartitionScannerConstants.SMARTY,
+ IPHPPartitionScannerConstants.SMARTY_MULTILINE_COMMENT,
IDocument.DEFAULT_CONTENT_TYPE };
}
@@ -235,6 +269,9 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
assistant.setContentAssistProcessor(processor, IPHPPartitionScannerConstants.CSS_MULTILINE_COMMENT);
assistant.setContentAssistProcessor(processor, IPHPPartitionScannerConstants.JAVASCRIPT);
assistant.setContentAssistProcessor(processor, IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT);
+ // TODO define special smarty partition content assist
+ assistant.setContentAssistProcessor(processor, IPHPPartitionScannerConstants.SMARTY);
+ assistant.setContentAssistProcessor(processor, IPHPPartitionScannerConstants.SMARTY_MULTILINE_COMMENT);
assistant.setContentAssistProcessor(new PHPCompletionProcessor(), IPHPPartitionScannerConstants.PHP);
@@ -289,10 +326,10 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
// prefix[0] is either '\t' or ' ' x tabWidth, depending on useSpaces
- final IPreferenceStore preferences= PHPeclipsePlugin.getDefault().getPreferenceStore();
- int tabWidth= preferences.getInt(PHPCore.FORMATTER_TAB_SIZE);
- boolean useSpaces= getPreferenceStore().getBoolean(SPACES_FOR_TABS);
-
+ final IPreferenceStore preferences = PHPeclipsePlugin.getDefault().getPreferenceStore();
+ int tabWidth = preferences.getInt(PHPCore.FORMATTER_TAB_SIZE);
+ boolean useSpaces = getPreferenceStore().getBoolean(SPACES_FOR_TABS);
+
for (int i = 0; i <= tabWidth; i++) {
StringBuffer prefix = new StringBuffer();
@@ -322,7 +359,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
*/
public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
// PHPColorProvider provider = PHPEditorEnvironment.getPHPColorProvider();
- JavaColorManager provider = PHPEditorEnvironment.getPHPColorProvider();
+ // JavaColorManager provider = PHPEditorEnvironment.getPHPColorProvider();
PresentationReconciler reconciler = new PresentationReconciler();
DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getHTMLScanner());
@@ -344,8 +381,18 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
dr = new DefaultDamagerRepairer(getHTMLScanner());
reconciler.setDamager(dr, IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT);
reconciler.setRepairer(dr, IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT);
+
+ dr = new DefaultDamagerRepairer(getSmartyScanner());
+ reconciler.setDamager(dr, IPHPPartitionScannerConstants.SMARTY);
+ reconciler.setRepairer(dr, IPHPPartitionScannerConstants.SMARTY);
+
+ dr = new DefaultDamagerRepairer(getSmartyDocScanner());
+ reconciler.setDamager(dr, IPHPPartitionScannerConstants.SMARTY_MULTILINE_COMMENT);
+ reconciler.setRepairer(dr, IPHPPartitionScannerConstants.SMARTY_MULTILINE_COMMENT);
+
dr =
- new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(PHPColorProvider.MULTI_LINE_COMMENT))));
+ new DefaultDamagerRepairer(
+ new SingleTokenScanner(new TextAttribute(fJavaTextTools.getColorManager().getColor(PHPColorProvider.MULTI_LINE_COMMENT))));
reconciler.setDamager(dr, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT);
reconciler.setRepairer(dr, IPHPPartitionScannerConstants.HTML_MULTILINE_COMMENT);
@@ -371,6 +418,61 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
* Method declared on SourceViewerConfiguration
*/
public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
- return new PHPTextHover();
+ IEditorInput editorInput = fEditor.getEditorInput();
+ if (editorInput instanceof IFileEditorInput) {
+ try {
+ IFile f = ((IFileEditorInput) editorInput).getFile();
+ return new PHPTextHover(f.getProject());
+ } catch (NullPointerException e) {
+ // this exception occurs, if getTextHover is called by preference pages !
+ }
+ }
+ return new PHPTextHover(null);
+ }
+
+ /*
+ * @see SourceViewerConfiguration#getInformationControlCreator(ISourceViewer)
+ * @since 2.0
+ */
+ public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) {
+ return new IInformationControlCreator() {
+ public IInformationControl createInformationControl(Shell parent) {
+ return new DefaultInformationControl(parent, SWT.NONE, new HTMLTextPresenter(true));
+ // return new HoverBrowserControl(parent);
+ }
+ };
+ }
+
+ /*
+ * @see SourceViewerConfiguration#getInformationPresenter(ISourceViewer)
+ * @since 2.0
+ */
+ // public IInformationPresenter getInformationPresenter(ISourceViewer sourceViewer) {
+ // InformationPresenter presenter= new InformationPresenter(getInformationPresenterControlCreator(sourceViewer));
+ // IInformationProvider provider= new JavaInformationProvider(getEditor());
+ // presenter.setInformationProvider(provider, IDocument.DEFAULT_CONTENT_TYPE);
+ // presenter.setInformationProvider(provider, IJavaPartitions.JAVA_DOC);
+ // presenter.setSizeConstraints(60, 10, true, true);
+ // return presenter;
+ // }
+
+ /**
+ * Returns the information presenter control creator. The creator is a factory creating the
+ * presenter controls for the given source viewer. This implementation always returns a creator
+ * for DefaultInformationControl instances.
+ *
+ * @param sourceViewer the source viewer to be configured by this configuration
+ * @return an information control creator
+ * @since 2.1
+ */
+ private IInformationControlCreator getInformationPresenterControlCreator(ISourceViewer sourceViewer) {
+ return new IInformationControlCreator() {
+ public IInformationControl createInformationControl(Shell parent) {
+ int shellStyle = SWT.RESIZE;
+ int style = SWT.V_SCROLL | SWT.H_SCROLL;
+ return new DefaultInformationControl(parent, shellStyle, style, new HTMLTextPresenter(false));
+ // return new HoverBrowserControl(parent);
+ }
+ };
}
}