pydev-cvs

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src_dltk_console/org/python/pydev/dltk/console/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31230/src_dltk_console/org/python/pydev/dltk/console/ui

Modified Files:
	ScriptConsoleSourceViewerConfiguration.java 
Log Message:
Context information being shown for completions

bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1939296&group_id=85796&atid=577329

Index: ScriptConsoleSourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_dltk_console/org/python/pydev/dltk/console/ui/ScriptConsoleSourceViewerConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScriptConsoleSourceViewerConfiguration.java	6 Apr 2008 19:51:33 -0000	1.4
--- ScriptConsoleSourceViewerConfiguration.java	12 Apr 2008 13:04:08 -0000	1.5
***************
*** 11,14 ****
--- 11,15 ----
  
  import org.eclipse.jface.text.IDocument;
+ import org.eclipse.jface.text.IInformationControlCreator;
  import org.eclipse.jface.text.ITextHover;
  import org.eclipse.jface.text.contentassist.IContentAssistant;
***************
*** 17,20 ****
--- 18,22 ----
  import org.eclipse.jface.text.source.SourceViewerConfiguration;
  import org.python.pydev.editor.autoedit.DefaultIndentPrefs;
+ import org.python.pydev.editor.codecompletion.PyContentAssistant;
  
  /**
***************
*** 27,35 ****
      private ITextHover hover;
  
!     private IContentAssistant contentAssist;
  
      private IQuickAssistAssistant quickAssist;
  
!     public ScriptConsoleSourceViewerConfiguration(ITextHover hover, IContentAssistant contentAssist, IQuickAssistAssistant quickAssist) {
          this.hover = hover;
          this.contentAssist = contentAssist;
--- 29,37 ----
      private ITextHover hover;
  
!     private PyContentAssistant contentAssist;
  
      private IQuickAssistAssistant quickAssist;
  
!     public ScriptConsoleSourceViewerConfiguration(ITextHover hover, PyContentAssistant contentAssist, IQuickAssistAssistant quickAssist) {
          this.hover = hover;
          this.contentAssist = contentAssist;
***************
*** 51,54 ****
--- 53,57 ----
      @Override
      public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+         contentAssist.setInformationControlCreator(this.getInformationControlCreator(sourceViewer));
          return contentAssist;
      }
***************
*** 56,60 ****
--- 59,74 ----
      @Override
      public IQuickAssistAssistant getQuickAssistAssistant(ISourceViewer sourceViewer) {
+         quickAssist.setInformationControlCreator(this.getInformationControlCreator(sourceViewer));
          return quickAssist;
      }
+     
+     /*
+      * (non-Javadoc)
+      * 
+      * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getInformationControlCreator(org.eclipse.jface.text.source.ISourceViewer)
+      */
+     public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) {
+         return PyContentAssistant.createInformationControlCreator(sourceViewer);
+     }
+ 
  }