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 ab128ff..360da1e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -15,6 +15,7 @@ import java.util.Vector;
 
 import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 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;
@@ -169,8 +170,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();
@@ -201,6 +208,25 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
     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.
    *
@@ -223,6 +249,8 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
       IPHPPartitionScannerConstants.CSS_MULTILINE_COMMENT,
       IPHPPartitionScannerConstants.JAVASCRIPT,
       IPHPPartitionScannerConstants.JS_MULTILINE_COMMENT,
+      IPHPPartitionScannerConstants.SMARTY,
+			IPHPPartitionScannerConstants.SMARTY_MULTILINE_COMMENT,
       IDocument.DEFAULT_CONTENT_TYPE };
   }
 
@@ -240,6 +268,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);
 
@@ -349,6 +380,15 @@ 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(fJavaTextTools.getColorManager().getColor(PHPColorProvider.MULTI_LINE_COMMENT))));
@@ -381,21 +421,54 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
       IFile f = ((IFileEditorInput) fEditor.getEditorInput()).getFile();
       return new PHPTextHover(f.getProject());
     } catch (NullPointerException e) {
-    	// this exception occurs, if getTextHover is called by preference pages !
+      // 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#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 <code>DefaultInformationControl</code> 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);
+      }
+    };
+  }
 }