[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion PyCompletionProposal.java, 1.1.2.12, 1.1.2.13 PythonCompletionProcessor.java, 1.33.2.7, 1.33.2.8 PyCodeCompletion.java, 1.64.2.2, 1.64.2.3

[Sean H. <se...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15666/src/org/python/pydev/editor/codecompletion

Modified Files:
      Tag: SoC_2006
	PyCompletionProposal.java PythonCompletionProcessor.java 
	PyCodeCompletion.java 
Log Message:


Index: PyCompletionProposal.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCompletionProposal.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** PyCompletionProposal.java	22 Jun 2006 09:29:17 -0000	1.1.2.12
--- PyCompletionProposal.java	25 Jun 2006 14:57:45 -0000	1.1.2.13
***************
*** 10,29 ****
  import org.eclipse.swt.graphics.Point;
  
- import org.eclipse.swt.widgets.Shell;
- 
- import org.eclipse.jface.dialogs.MessageDialog;
- 
- import org.eclipse.jface.text.IRegion;
- import org.eclipse.jface.text.Region;
- import org.eclipse.jface.text.link.LinkedModeModel;
- import org.eclipse.jface.text.link.LinkedModeUI;
- import org.eclipse.jface.text.link.LinkedPosition;
- import org.eclipse.jface.text.link.LinkedPositionGroup;
- 
- import org.eclipse.ui.IEditorPart;
- import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
- 
- 
- 
  
  /**
--- 10,13 ----
***************
*** 51,70 ****
      protected int priority;
  
-     /*
-      * Strip the args from a signature.
-      */
-     private String stripArgs(String sig) {
-     	if(sig.indexOf('(') != -1) {
-     		sig = sig.substring(sig.indexOf('('), sig.length());
-     	} else {
-     		sig = null;
-     	}
-     	if(sig.length() > 2) {
-     		return sig;
-     	} else {
-     		return null;
-     	}
-     }
- 
  	/**
  	 * Creates a new completion proposal based on the provided information. The replacement string is
--- 35,38 ----
***************
*** 78,97 ****
  	public PyCompletionProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, int priority) {
  		this(replacementString, replacementOffset, replacementLength, cursorPosition, null, null, null, null, priority);
- 		fContextInformation = new IContextInformation(){
- 			String args = stripArgs(fReplacementString);
-             public String getContextDisplayString() {
-                 return null;
-             }
- 
-             public Image getImage() {
-                 return null;
-             }
- 
-             public String getInformationDisplayString() {
-                 return args;
-             }
-            
-         };
- 
  	}
  
--- 46,49 ----
***************
*** 120,141 ****
  		fImage= image;
  		fDisplayString= displayString;
  		fAdditionalProposalInfo= additionalProposalInfo;
  		this.priority = priority;
- 		fContextInformation = new IContextInformation(){
- 			String args = stripArgs(fReplacementString);
-             public String getContextDisplayString() {
-                 return null;
-             }
- 
-             public Image getImage() {
-                 return null;
-             }
-             
-             public String getInformationDisplayString() {
-                 return args;
-             }
-            
-         };
- 
  	}
  
--- 72,78 ----
  		fImage= image;
  		fDisplayString= displayString;
+ 		fContextInformation= contextInformation;
  		fAdditionalProposalInfo= additionalProposalInfo;
  		this.priority = priority;
  	}
  
***************
*** 180,187 ****
  		return fReplacementString;
  	}
- 	
- 	public String getfReplacementString() {
- 		return fReplacementString;
- 	}
  
  	/*
--- 117,120 ----

Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.64.2.2
retrieving revision 1.64.2.3
diff -C2 -d -r1.64.2.2 -r1.64.2.3
*** PyCodeCompletion.java	22 Jun 2006 09:29:17 -0000	1.64.2.2
--- PyCodeCompletion.java	25 Jun 2006 14:57:46 -0000	1.64.2.3
***************
*** 236,240 ****
              }
  
!             changeItokenToCompletionProposal(viewer, request, ret, theList, importsTip);
          } catch (CompletionRecursionException e) {
              ret.add(new CompletionProposal("",request.documentOffset,0,0,null,e.getMessage(), null,null));
--- 236,240 ----
              }
  
!             changeItokenToCompletionPropostal(viewer, request, ret, theList, importsTip);
          } catch (CompletionRecursionException e) {
              ret.add(new CompletionProposal("",request.documentOffset,0,0,null,e.getMessage(), null,null));
***************
*** 357,361 ****
       * @param importsTip
       */
!     private void changeItokenToCompletionProposal(ITextViewer viewer, CompletionRequest request, List convertedProposals, List iTokenList, boolean importsTip) {
          //TODO: check org.eclipse.jface.text.templates.TemplateCompletionProcessor to see how to do custom 'selections' in completions
  //        int offset = request.documentOffset;
--- 357,361 ----
       * @param importsTip
       */
!     private void changeItokenToCompletionPropostal(ITextViewer viewer, CompletionRequest request, List convertedProposals, List iTokenList, boolean importsTip) {
          //TODO: check org.eclipse.jface.text.templates.TemplateCompletionProcessor to see how to do custom 'selections' in completions
  //        int offset = request.documentOffset;

Index: PythonCompletionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonCompletionProcessor.java,v
retrieving revision 1.33.2.7
retrieving revision 1.33.2.8
diff -C2 -d -r1.33.2.7 -r1.33.2.8
*** PythonCompletionProcessor.java	22 Jun 2006 09:29:17 -0000	1.33.2.7
--- PythonCompletionProcessor.java	25 Jun 2006 14:57:45 -0000	1.33.2.8
***************
*** 19,25 ****
  import org.python.pydev.editor.PyEdit;
  import org.python.pydev.editor.codecompletion.revisited.CompletionRecursionException;
- import org.python.pydev.editor.codecompletion.shell.AbstractShell;
  import org.python.pydev.plugin.PydevPlugin;
- import org.python.pydev.plugin.nature.PythonNature;
  
  /**
--- 19,23 ----
***************
*** 83,87 ****
              //Get code completion proposals
              if(PyCodeCompletionPreferencesPage.useCodeCompletion()){
- 	
                  Object[] objects = new Object[]{new ArrayList(), new Boolean(true)};
                  try {
--- 81,84 ----
***************
*** 224,235 ****
       */
      public char[] getContextInformationAutoActivationCharacters() {
!         char[] c = new char[0];
!         if (PyCodeCompletionPreferencesPage.isToAutocompleteOnDot()) {
!             c = addChar(c, '.');
!         }
!         if (PyCodeCompletionPreferencesPage.isToAutocompleteOnPar()) {
!             c = addChar(c, '(');
!         }
!         return c;
      }
  
--- 221,225 ----
       */
      public char[] getContextInformationAutoActivationCharacters() {
!         return new char[] {};
      }
  
***************
*** 248,267 ****
      }
  
- 
      /**
!      *
       * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
       */
      public IContextInformationValidator getContextInformationValidator() {
!         return new IContextInformationValidator(){
! 
!             public void install(IContextInformation info, ITextViewer viewer, int offset) {
!             }
! 
!             public boolean isContextInformationValid(int offset) {
!                 return true;
!             }
!            
!         };
      }
  
--- 238,247 ----
      }
  
      /**
!      * 
       * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
       */
      public IContextInformationValidator getContextInformationValidator() {
!         return null;
      }