Commit graph

1856 commits

Author SHA1 Message Date
Gil Forsyth
08137bfb88 Make quoted parens safe in multiline
This is... not the prettiest solution in the world.  I've been banging
my head against it and I can't figure out a way to gracefully exit the
keystroke event when using a `try: except:` snippet to test against `execer.compile`
2016-01-05 17:52:32 -05:00
Gil Forsyth
efc44cb2ad quick fix for colon indentation -- other issues remain 2016-01-05 13:45:13 -05:00
Gil Forsyth
8b4c622051 cleanup unused imports and pep8 stuff 2016-01-05 11:09:55 -05:00
Gil Forsyth
9b8c6717ac update ptk completer to work in multiline env 2016-01-05 10:59:39 -05:00
Gil Forsyth
1b0fd03574 update and cleanup multiline preliminary parser
Preliminary parser to determine if 'Enter' key should send command to the
xonsh parser for execution or should insert a newline for continued
input.

Current 'triggers' for inserting a newline are:
- Not on first line of buffer and line is non-empty
- Previous character is a colon (covers if, for, etc...)
- User is in an open paren-block
- Line ends with backslash
- Any text exists below cursor position (relevant when editing previous
multiline blocks)
2016-01-04 15:34:24 -05:00
Gil Forsyth
85eb40fa2f remove cruft 2016-01-04 12:32:27 -05:00
Gil Forsyth
316c090cd7 bind 'Enter' to multiline 'Enter' routine 2016-01-04 12:28:56 -05:00
Gil Forsyth
c5802c769f add open paren-block check to multiline environment 2016-01-04 12:25:14 -05:00
Gil Forsyth
d9207ee0ac Merge branch 'master' of https://github.com/scopatz/xonsh into multiline 2016-01-04 12:00:56 -05:00
Gil Forsyth
0bbcc3f9eb Merge branch 'multiline' of github.com:gforsyth/xonsh into multiline 2016-01-04 11:58:51 -05:00
Gil Forsyth
41b144e37d rename carriage return event
better names make everything better
2016-01-04 08:36:31 -05:00
Anthony Scopatz
5caa9b7a76 Merge branch 'adqm-completer_dollar' 2016-01-02 12:17:16 -08:00
adam j hartz
b5c5de5925 better fix for dollar signs 2016-01-02 14:52:24 -05:00
adam j hartz
5bc784290b Merge branch 'ptk-hist' of https://github.com/scopatz/xonsh into scopatz-ptk-updates 2016-01-01 20:25:09 -05:00
adam j hartz
61e1ed3178 Merge branch 'ptk-prompt' of https://github.com/scopatz/xonsh into scopatz-ptk-updates 2016-01-01 20:25:05 -05:00
Anthony Scopatz
f1827e1d33 more docs 2016-01-01 12:00:55 -08:00
Anthony Scopatz
0d918ee9af Merge branch 'adqm-completer' 2016-01-01 11:33:36 -08:00
adam j hartz
fc7ae4a978 add space to 'from <tab>' completions 2016-01-01 10:01:03 -05:00
adam j hartz
a5bcf1a25c only quote those names that need quoting 2016-01-01 09:56:52 -05:00
adam j hartz
876cfd28be change characters that require quoting 2016-01-01 09:54:24 -05:00
adam j hartz
91aeb2fb9e don't resort result of inspect.getmembers 2016-01-01 09:49:51 -05:00
adam j hartz
13f599ba0c several fixes for python mode completions 2016-01-01 09:48:49 -05:00
adam j hartz
58a65ee08e pep8 fixes 2016-01-01 09:45:28 -05:00
adam j hartz
1ac51ef8f4 user import_module instead of __import__, and try/except 2016-01-01 09:15:26 -05:00
Anthony Scopatz
4ca6f1c0be Merge branch 'ptk-prompt' into ptk-hist 2015-12-31 21:57:00 -08:00
Anthony Scopatz
3db0bbe7e5 some pep8 2015-12-31 21:56:24 -08:00
Anthony Scopatz
c3ded7bc92 reserve space when quoting 2015-12-31 21:50:31 -08:00
Anthony Scopatz
15373dd51f 3 -> 5 2015-12-31 21:42:12 -08:00
adam j hartz
80a76e8951 support completions for 'from module import <tab>' 2015-12-31 18:41:48 -05:00
adam j hartz
07103c17f7 avoid repeat completions 2015-12-31 18:24:29 -05:00
adam j hartz
a9a17fa67d slight efficiency improvement in completer cache 2015-12-31 17:55:55 -05:00
Anthony Scopatz
a432960cb3 updated changelog 2015-12-30 23:02:28 -08:00
Anthony Scopatz
bbffd9449f Merge branch 'ptk-prompt' into ptk-hist 2015-12-30 23:00:47 -08:00
Anthony Scopatz
045408990a updated changelog 2015-12-30 23:00:05 -08:00
Anthony Scopatz
018b301dd5 Merge branch 'clog' into ptk-prompt 2015-12-30 22:57:40 -08:00
Anthony Scopatz
23b3dd1013 init'd a changelog 2015-12-30 22:54:32 -08:00
Anthony Scopatz
d8b519e17c reset ptk history 2015-12-30 21:28:39 -08:00
Anthony Scopatz
a68c6b1d48 added deprecation warnings 2015-12-30 18:54:13 -08:00
Anthony Scopatz
75892e20b4 some doc updates 2015-12-30 18:45:14 -08:00
Anthony Scopatz
ba99d2a2ee added $COMPLETIONS_MENU_ROWS 2015-12-30 18:40:58 -08:00
Anthony Scopatz
06c19a3c6f finally have desired behvaiour 2015-12-30 18:15:42 -08:00
Anthony Scopatz
c1f3a8ed04 getting there 2015-12-30 17:59:26 -08:00
adam j hartz
1c6dbe6b58 Merge pull request #588 from scopatz/timeit-comp
added timeit alias to completion skip tokens
2015-12-30 19:24:56 -05:00
Anthony Scopatz
9c4ddb10f7 more complete shortcut fork 2015-12-30 13:21:31 -08:00
Anthony Scopatz
69244d4a7b Merge branch 'master' into ptk-prompt 2015-12-30 12:48:06 -08:00
Anthony Scopatz
43dc1ae104 added timeit alias to completion skip tokens 2015-12-30 11:57:35 -08:00
Anthony Scopatz
c24f256236 glob uploads 2015-12-30 11:47:04 -08:00
Anthony Scopatz
526499b8cf version bump to 0.2.4 2015-12-30 11:13:52 -08:00
Anthony Scopatz
62f588196b minor doer issue 2015-12-30 11:13:24 -08:00
Anthony Scopatz
60dcb06ef5 minor doc fix 2015-12-30 11:08:44 -08:00