Commit graph

1987 commits

Author SHA1 Message Date
Anthony Scopatz
438fa3261d some text clarity 2016-01-08 18:29:44 -08:00
Anthony Scopatz
273d8d1066 turned off multiline input for xonfig 2016-01-08 18:03:47 -08:00
Anthony Scopatz
f68a488bc6 Merge branch 'master' into xonfig 2016-01-08 17:50:02 -08:00
adam j hartz
72d6aa7f41 change behavior of environment get and __getitem__ 2016-01-08 18:17:51 -05:00
Anthony Scopatz
93fa19d1ba minor docs 2016-01-07 15:49:35 -08:00
Anthony Scopatz
f4fc3c930e Merge branch 'master' into xonfig 2016-01-07 15:40:28 -08:00
Anthony Scopatz
bd964ce552 Merge pull request #609 from gforsyth/multiline_fix
help `compile` not lose its mind
2016-01-07 15:38:57 -08:00
Gil Forsyth
e773a5e98e help compile not lose its mind 2016-01-07 18:15:47 -05:00
Anthony Scopatz
229b8cfb24 Merge pull request #608 from gforsyth/buf_reset
fix buffer reset in ptk history
2016-01-07 13:55:28 -08:00
Gil Forsyth
090558203e fix buffer reset in ptk history
If this is only `buf.reset()`, it's possible to begin entering text in a
new terminal window which is then cleared shortly after startup
(depending, I imagine, on how much history is being loaded and how long
that takes).  Passing in the current document as `initial_document`
fixes this and history is still accessible as before.
2016-01-07 16:18:08 -05:00
Anthony Scopatz
024b63eea8 fixed merge conflict 2016-01-06 16:36:32 -08:00
Anthony Scopatz
e02700fb56 Merge branch 'multiline' 2016-01-06 16:30:08 -08:00
Gil Forsyth
00c1fa43a3 update changelog with ptk multiline note 2016-01-06 19:04:13 -05:00
Gil Forsyth
7efa5948cd remove unused regexes 2016-01-06 19:02:40 -05:00
Gil Forsyth
1f2bdefc69 Merge pull request #1 from scopatz/multiline
multiline can-compile in ptk
2016-01-06 18:22:34 -05:00
Anthony Scopatz
09c3db6ff7 multiline can-compile in ptk 2016-01-06 15:16:00 -08:00
Gil Forsyth
fa369deccd Merge branch 'master' of https://github.com/scopatz/xonsh into multiline 2016-01-06 12:05:00 -05:00
Gil Forsyth
fca174ba97 fix indexing on multiline completion 2016-01-06 12:04:38 -05:00
Gil Forsyth
40c5dbed06 fix another bug in preliminary parser
There may be a way to simplify this, but for now it seems that two
checks need to occur to get the desired behavior:
1. The current line is empty (`len(line) == 0`)
or
2. The current line is only whitespace
2016-01-06 11:58:24 -05:00
Gil Forsyth
719439580b add multiline support to ptk history 2016-01-06 11:53:29 -05:00
Anthony Scopatz
07bcf4401d added stuff to the changelog 2016-01-06 02:03:49 -08:00
Anthony Scopatz
2f925aa3f1 autogen config var docs 2016-01-06 01:55:40 -08:00
Anthony Scopatz
b78d31359f added makedirs() 2016-01-06 00:24:35 -08:00
Anthony Scopatz
6457fad898 run config on startup if not present 2016-01-06 00:21:20 -08:00
Anthony Scopatz
d61a4b433f more formatting fixes 2016-01-05 23:57:25 -08:00
Anthony Scopatz
1ff2f5796f nice 2016-01-05 23:33:04 -08:00
Anthony Scopatz
c33e58304b nice stuff 2016-01-05 23:30:54 -08:00
Anthony Scopatz
4642ab93cc Merge branch 'master' into xonfig 2016-01-05 23:06:19 -08:00
Anthony Scopatz
b2e3d2c37d minor change 2016-01-05 23:05:33 -08:00
Anthony Scopatz
164da937ce more awesome 2016-01-05 18:58:42 -08:00
Anthony Scopatz
100872f4e4 docs compile 2016-01-05 17:57:55 -08:00
Anthony Scopatz
c276758d1e even more docs 2016-01-05 17:48:07 -08:00
Anthony Scopatz
bdfe05a406 more docs 2016-01-05 17:38:45 -08:00
Anthony Scopatz
f8f6f47c5d wooo 2016-01-05 17:19:24 -08:00
Anthony Scopatz
412261774c partial vardocs 2016-01-05 16:37:12 -08:00
Gil Forsyth
3b72a03a72 clean up formatting 2016-01-05 19:02:04 -05:00
Gil Forsyth
dde63dde22 fix dedent behavior 2016-01-05 18:58:14 -05:00
Anthony Scopatz
562d794b2f added color in more places 2016-01-05 15:32:04 -08:00
Gil Forsyth
251d8b1610 add dedent token support and fix exit conditions
`current_line.isspace()` is not the same as `len(current_line)==0`
2016-01-05 18:05:03 -05:00
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
Anthony Scopatz
9e48e9cdd1 return env to original state 2016-01-05 14:07:24 -08:00
Anthony Scopatz
2ad910b8bd seems to work 2016-01-05 13:46:18 -08:00
Anthony Scopatz
9d6ecb22eb some bug fixes 2016-01-05 13:35:40 -08:00
Anthony Scopatz
30a2cf4aea more while 2016-01-05 13:34:04 -08:00
Anthony Scopatz
ce2d2c91d0 idx name 2016-01-05 12:18:08 -08:00
Anthony Scopatz
2a84a2d20f added changelog 2016-01-05 11:32:38 -08:00
Anthony Scopatz
a4cfe706b6 refactor 2016-01-05 11:31:12 -08:00
Anthony Scopatz
dc87926b23 have while printer 2016-01-05 11:28:12 -08:00
Anthony Scopatz
98ec82d49d Merge branch 'master' into xonfig 2016-01-05 11:01:13 -08:00
Gil Forsyth
efc44cb2ad quick fix for colon indentation -- other issues remain 2016-01-05 13:45:13 -05:00