Improved auto completion

[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 c6aaad9..2cb2397 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -11,7 +11,6 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor;
 
-
 import java.util.List;
 
 import org.eclipse.swt.graphics.RGB;
@@ -45,123 +44,125 @@ import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
  */
 public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 
-       /**
-        * Single token scanner.
-        */
-       static class SingleTokenScanner extends BufferedRuleBasedScanner {
-               public SingleTokenScanner(TextAttribute attribute) {
-                       setDefaultReturnToken(new Token(attribute));
-               }
-       };
-
-       /**
-        * Default constructor.
-        */
-       public PHPSourceViewerConfiguration() {
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-               return new PHPAnnotationHover();
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       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) {
-               return new String[] {
-                       IDocument.DEFAULT_CONTENT_TYPE,
-      PHPPartitionScanner.PHP,
-               //      PHPPartitionScanner.JAVA_DOC,
-                       PHPPartitionScanner.JAVA_MULTILINE_COMMENT };
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-
-               ContentAssistant assistant = new ContentAssistant();
-               assistant.setContentAssistProcessor(new PHPCompletionProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
-       //      assistant.setContentAssistProcessor(new JavaDocCompletionProcessor(), PHPPartitionScanner.JAVA_DOC);
-
-               assistant.enableAutoActivation(true);
-               assistant.setAutoActivationDelay(500);
-               assistant.setProposalPopupOrientation(assistant.PROPOSAL_OVERLAY);
-               assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE);
-               assistant.setContextInformationPopupBackground(PHPEditorEnvironment.getJavaColorProvider().getColor(new RGB(150, 150, 0)));
-
-               return assistant;
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) {
-               return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? "//" : null); //$NON-NLS-1$
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       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$
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-
-               PHPColorProvider provider = PHPEditorEnvironment.getJavaColorProvider();
-               PresentationReconciler reconciler = new PresentationReconciler();
-
-               DefaultDamagerRepairer 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);
+  /**
+   * Single token scanner.
+   */
+  static class SingleTokenScanner extends BufferedRuleBasedScanner {
+    public SingleTokenScanner(TextAttribute attribute) {
+      setDefaultReturnToken(new Token(attribute));
+    }
+  };
+
+  /**
+   * Default constructor.
+   */
+  public PHPSourceViewerConfiguration() {
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+    return new PHPAnnotationHover();
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  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) {
+    return new String[] { IDocument.DEFAULT_CONTENT_TYPE, PHPPartitionScanner.PHP,
+      //       PHPPartitionScanner.JAVA_DOC,
+      PHPPartitionScanner.HTML_MULTILINE_COMMENT };
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+
+    ContentAssistant assistant = new ContentAssistant();
+    // assistant.setContentAssistProcessor(new PHPCompletionProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
+    assistant.setContentAssistProcessor(new PHPCompletionProcessor(), PHPPartitionScanner.PHP);
+
+    assistant.enableAutoActivation(true);
+    assistant.setAutoActivationDelay(500);
+    assistant.setProposalPopupOrientation(assistant.PROPOSAL_OVERLAY);
+    assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE);
+    assistant.setContextInformationPopupBackground(PHPEditorEnvironment.getPHPColorProvider().getColor(new RGB(150, 150, 0)));
+
+    return assistant;
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) {
+    return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? "//" : null); //$NON-NLS-1$
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  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$
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+
+    PHPColorProvider provider = PHPEditorEnvironment.getPHPColorProvider();
+    PresentationReconciler reconciler = new PresentationReconciler();
+    
+    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());
     reconciler.setDamager(dr, PHPPartitionScanner.PHP);
     reconciler.setRepairer(dr, PHPPartitionScanner.PHP);
-    
-//             dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.JAVADOC_DEFAULT))));
-//             reconciler.setDamager(dr, PHPPartitionScanner.JAVA_DOC);
-//             reconciler.setRepairer(dr, PHPPartitionScanner.JAVA_DOC);
-
-               dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.MULTI_LINE_COMMENT))));
-               reconciler.setDamager(dr, PHPPartitionScanner.JAVA_MULTILINE_COMMENT);
-               reconciler.setRepairer(dr, PHPPartitionScanner.JAVA_MULTILINE_COMMENT);
-
-               return reconciler;
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       public int getTabWidth(ISourceViewer sourceViewer) {
-               return 4;
-       }
-
-       /* (non-Javadoc)
-        * Method declared on SourceViewerConfiguration
-        */
-       public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
-               return new PHPTextHover();
-       }
+
+//    dr = new DefaultDamagerRepairer(PHPEditorEnvironment.getHTMLCodeScanner());
+//    reconciler.setDamager(dr, PHPPartitionScanner.HTML);
+//    reconciler.setRepairer(dr, PHPPartitionScanner.HTML);
+
+    dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.MULTI_LINE_COMMENT))));
+    reconciler.setDamager(dr, PHPPartitionScanner.HTML_MULTILINE_COMMENT);
+    reconciler.setRepairer(dr, PHPPartitionScanner.HTML_MULTILINE_COMMENT);
+
+    return reconciler;
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  public int getTabWidth(ISourceViewer sourceViewer) {
+    return 4;
+  }
+
+  /* (non-Javadoc)
+   * Method declared on SourceViewerConfiguration
+   */
+  public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+    return new PHPTextHover();
+  }
 }