Thread: [Pydev-cvs] org.python.pydev.core/src/org/python/pydev/core/docutils PySelection.java, 1.57, 1.58 P
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-02-23 18:58:18
|
Update of /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2324/src/org/python/pydev/core/docutils Modified Files: PySelection.java PyDocIterator.java Log Message: - Previous/Next method working without successful parse. - Parsing scope on local rename improvements. Index: PySelection.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils/PySelection.java,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** PySelection.java 23 Jan 2008 00:44:29 -0000 1.57 --- PySelection.java 23 Feb 2008 18:58:22 -0000 1.58 *************** *** 1463,1466 **** --- 1463,1467 ---- private boolean isFirst = true; private int numberOfLines; + private int lastReturnedLine=-1; private PySelection ps; *************** *** 1500,1503 **** --- 1501,1505 ---- if (forward) { line = ps.getLine(startingLine); + lastReturnedLine = startingLine; startingLine++; } else { *************** *** 1508,1511 **** --- 1510,1514 ---- line = ps.getLine(startingLine); } + lastReturnedLine = startingLine; startingLine--; } *************** *** 1519,1522 **** --- 1522,1529 ---- throw new RuntimeException("Remove not implemented."); } + + public int getLastReturnedLine() { + return lastReturnedLine; + } } Index: PyDocIterator.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils/PyDocIterator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PyDocIterator.java 15 Jun 2007 02:05:50 -0000 1.6 --- PyDocIterator.java 23 Feb 2008 18:58:22 -0000 1.7 *************** *** 10,20 **** private int offset; private IDocument doc; private boolean addNewLinesToRet = true; private boolean returnNewLinesOnLiterals = false; private boolean inLiteral = false; ! private int literalEnd; ! private boolean changeLiteralsForSpaces; private int lastReturned = -1; ! private boolean addComments; public PyDocIterator(IDocument doc, boolean addNewLinesToRet) { --- 10,21 ---- private int offset; private IDocument doc; + private boolean addNewLinesToRet = true; private boolean returnNewLinesOnLiterals = false; private boolean inLiteral = false; ! private int literalEnd = 0; ! private boolean changeLiteralsForSpaces = false; private int lastReturned = -1; ! private boolean addComments = false; public PyDocIterator(IDocument doc, boolean addNewLinesToRet) { *************** *** 43,46 **** --- 44,58 ---- this.doc = doc; } + + /** + * Changes the current offset in the document. Note: this method is not safe for use after the iteration + * started! + * + * @param offset the offset where this class should start parsing (note: the offset must be a + * code partition, otherwise the yielded values will be wrong). + */ + public void setStartingOffset(int offset){ + this.offset = offset; + } public boolean hasNext() { |