[Pydev-cvs] org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole PydevConsoleFacto
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-09-27 20:00:28
|
Update of /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20604/src_console/org/python/pydev/debug/newconsole Modified Files: PydevConsoleFactory.java PydevConsoleInterpreter.java PydevConsole.java PydevConsoleCompletionProcessor.java PydevConsoleCommunication.java Log Message: Synching to latest changes: Pydev <ul> <li><strong>Editor</strong>: Cursor settings no longer overridden</li> <li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li> <li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li> <li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li> <li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li> <li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li> <li><strong>Syntax check</strong>: Option to do only on active editor</li> </ul> Also: tabs changed for spaces Index: PydevConsoleCommunication.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleCommunication.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PydevConsoleCommunication.java 21 Aug 2008 20:56:33 -0000 1.12 --- PydevConsoleCommunication.java 27 Sep 2008 19:59:08 -0000 1.13 *************** *** 260,264 **** continue; }else{ ! break; } } --- 260,264 ---- continue; }else{ ! break; } } *************** *** 347,352 **** // ret.add(new PyCompletionProposal(name, ! // offset-length, length, name.length(), ! // PyCodeCompletionImages.getImageForType(type), name, null, docStr, priority)); int cursorPos = name.length(); --- 347,352 ---- // ret.add(new PyCompletionProposal(name, ! // offset-length, length, name.length(), ! // PyCodeCompletionImages.getImageForType(type), name, null, docStr, priority)); int cursorPos = name.length(); Index: PydevConsoleFactory.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PydevConsoleFactory.java 2 Apr 2008 01:07:49 -0000 1.7 --- PydevConsoleFactory.java 27 Sep 2008 19:59:08 -0000 1.8 *************** *** 42,48 **** PydevConsoleInterpreter interpreter = createDefaultPydevInterpreter(); if(interpreter != null){ ! PydevConsole console = new PydevConsole(interpreter); ! manager.add(console, true); ! return console; } } catch (Exception e) { --- 42,48 ---- PydevConsoleInterpreter interpreter = createDefaultPydevInterpreter(); if(interpreter != null){ ! PydevConsole console = new PydevConsole(interpreter); ! manager.add(console, true); ! return console; } } catch (Exception e) { Index: PydevConsole.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsole.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PydevConsole.java 17 Aug 2008 00:26:56 -0000 1.9 --- PydevConsole.java 27 Sep 2008 19:59:08 -0000 1.10 *************** *** 145,178 **** lineTracker.init(new IConsole(){ ! //IMPLEMENTATIONS FORWARDED TO OUTER CLASS ! public void addLink(IConsoleHyperlink link, int offset, int length) { ! PydevConsole.this.addLink(link, offset, length); ! } ! public void addLink(IHyperlink link, int offset, int length) { ! PydevConsole.this.addLink(link, offset, length); ! } ! public void addPatternMatchListener( ! IPatternMatchListener matchListener) { ! PydevConsole.this.addPatternMatchListener(matchListener); ! } ! public IDocument getDocument() { ! return PydevConsole.this.getDocument(); ! } ! public IRegion getRegion(IConsoleHyperlink link) { ! return PydevConsole.this.getRegion(link); ! } ! public IRegion getRegion(IHyperlink link) { ! return PydevConsole.this.getRegion(link); ! } ! public void removePatternMatchListener( ! IPatternMatchListener matchListener) { ! PydevConsole.this.removePatternMatchListener(matchListener); ! } ! ! //IMPLEMENTATIONS THAT AREN'T REALLY AVAILABLE IN THE PYDEV CONSOLE ! public void connect(IStreamsProxy streamsProxy) {/**EMPTY**/} ! public void connect(IStreamMonitor streamMonitor, String streamIdentifer) {/**EMPTY**/} ! public IProcess getProcess() {return null;/**EMPTY**/} ! public IOConsoleOutputStream getStream(String streamIdentifier) {return null;/**EMPTY**/} }); --- 145,178 ---- lineTracker.init(new IConsole(){ ! //IMPLEMENTATIONS FORWARDED TO OUTER CLASS ! public void addLink(IConsoleHyperlink link, int offset, int length) { ! PydevConsole.this.addLink(link, offset, length); ! } ! public void addLink(IHyperlink link, int offset, int length) { ! PydevConsole.this.addLink(link, offset, length); ! } ! public void addPatternMatchListener( ! IPatternMatchListener matchListener) { ! PydevConsole.this.addPatternMatchListener(matchListener); ! } ! public IDocument getDocument() { ! return PydevConsole.this.getDocument(); ! } ! public IRegion getRegion(IConsoleHyperlink link) { ! return PydevConsole.this.getRegion(link); ! } ! public IRegion getRegion(IHyperlink link) { ! return PydevConsole.this.getRegion(link); ! } ! public void removePatternMatchListener( ! IPatternMatchListener matchListener) { ! PydevConsole.this.removePatternMatchListener(matchListener); ! } ! ! //IMPLEMENTATIONS THAT AREN'T REALLY AVAILABLE IN THE PYDEV CONSOLE ! public void connect(IStreamsProxy streamsProxy) {/**EMPTY**/} ! public void connect(IStreamMonitor streamMonitor, String streamIdentifer) {/**EMPTY**/} ! public IProcess getProcess() {return null;/**EMPTY**/} ! public IOConsoleOutputStream getStream(String streamIdentifier) {return null;/**EMPTY**/} }); Index: PydevConsoleInterpreter.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleInterpreter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PydevConsoleInterpreter.java 4 Apr 2008 02:54:42 -0000 1.6 --- PydevConsoleInterpreter.java 27 Sep 2008 19:59:08 -0000 1.7 *************** *** 39,51 **** @SuppressWarnings("unchecked") ! public PydevConsoleInterpreter() { List<Object> p = ExtensionHelper.getParticipants(ExtensionHelper.PYDEV_SIMPLE_ASSIST); ArrayList<ISimpleAssistParticipant2> list = new ArrayList<ISimpleAssistParticipant2>(); for(Object o:p){ ! if(o instanceof ISimpleAssistParticipant2){ ! list.add((ISimpleAssistParticipant2) o); ! } } ! this.simpleParticipants = list; } --- 39,51 ---- @SuppressWarnings("unchecked") ! public PydevConsoleInterpreter() { List<Object> p = ExtensionHelper.getParticipants(ExtensionHelper.PYDEV_SIMPLE_ASSIST); ArrayList<ISimpleAssistParticipant2> list = new ArrayList<ISimpleAssistParticipant2>(); for(Object o:p){ ! if(o instanceof ISimpleAssistParticipant2){ ! list.add((ISimpleAssistParticipant2) o); ! } } ! this.simpleParticipants = list; } Index: PydevConsoleCompletionProcessor.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleCompletionProcessor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PydevConsoleCompletionProcessor.java 12 Apr 2008 15:39:58 -0000 1.5 --- PydevConsoleCompletionProcessor.java 27 Sep 2008 19:59:08 -0000 1.6 *************** *** 48,52 **** public char[] getCompletionProposalAutoActivationCharacters() { return SimpleAssistProcessor.getStaticAutoActivationCharacters( ! PythonCompletionProcessor.getStaticCompletionProposalAutoActivationCharacters(), 0); } --- 48,52 ---- public char[] getCompletionProposalAutoActivationCharacters() { return SimpleAssistProcessor.getStaticAutoActivationCharacters( ! PythonCompletionProcessor.getStaticCompletionProposalAutoActivationCharacters(), 0); } |