[Pydev-cvs] org.python.pydev.core/src/org/python/pydev/core ILocalScope.java, NONE, 1.1 IModule.java, 1.3, 1.4 ICodeCompletionASTManager.java, 1.10, 1.11

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

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

Modified Files:
	IModule.java ICodeCompletionASTManager.java 
Added Files:
	ILocalScope.java 
Log Message:
Completion for parameters (only based on the local context)

--- NEW FILE: ILocalScope.java ---
/*
 * Created on Sep 23, 2006
 * @author Fabio
 */
package org.python.pydev.core;

import java.util.List;

import org.python.pydev.core.structure.FastStack;

public interface ILocalScope {

    /**
     * Checks if this scope is an outer scope of the scope passed as a param (s).
     * Or if it is the same scope. 
     */
    public boolean isOuterOrSameScope(ILocalScope s);

    /**
     * @return all the local tokens found 
     */
    public IToken[] getAllLocalTokens();

    /**
     * @param endLine tokens will only be recognized if its beginLine is higher than this parameter.
     */
    public IToken[] getLocalTokens(int endLine, int col, boolean onlyArgs);

    /**
     * @return the modules that are imported in the current (local) scope as tokens
     */
    public List<IToken> getLocalImportedModules(int line, int col, String moduleName);

    /**
     * @return whether the last element found in this scope is a class definition
     */
    public boolean isLastClassDef();

    /**
     * @return the scope stack with simple nodes
     */
    public FastStack getScopeStack();

}
Index: ICodeCompletionASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/ICodeCompletionASTManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ICodeCompletionASTManager.java	17 Sep 2006 23:25:33 -0000	1.10
--- ICodeCompletionASTManager.java	23 Sep 2006 21:22:32 -0000	1.11
***************
*** 178,181 ****
--- 178,182 ----
       */
      public abstract IToken[] getCompletionsForModule(IModule module, ICompletionState state, boolean searchSameLevelMods);
+     public abstract IToken[] getCompletionsForModule(IModule module, ICompletionState state, boolean searchSameLevelMods, boolean lookForArgumentCompletion);
  
      /**

Index: IModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/IModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IModule.java	23 Sep 2006 13:00:36 -0000	1.3
--- IModule.java	23 Sep 2006 21:22:32 -0000	1.4
***************
*** 80,91 ****
  
      /**
-      * 
       * @return the docstring for a module.
       */
      public abstract String getDocString();
  
      public abstract String getName();
  
!     public abstract List<IToken> getLocalImportedModules(int line, int col);
  
  }
\ No newline at end of file
--- 80,97 ----
  
      /**
       * @return the docstring for a module.
       */
      public abstract String getDocString();
  
+     /**
+      * @return the name of the module
+      */
      public abstract String getName();
  
!     /**
!      * @return the local scope in the module for a given line and column
!      * May return null if no scope is found
!      */
!     public abstract ILocalScope getLocalScope(int line, int col);
  
  }
\ No newline at end of file