Commit graph

1788 commits

Author SHA1 Message Date
adam j hartz
d06e702be3 use ast.literal_eval instead of plain eval for strings 2015-12-15 06:37:20 -05:00
adam j hartz
08dabd2dd0 pre-compile some regexes 2015-12-15 06:34:03 -05:00
adam j hartz
20bf953d64 use get_sep instead of hard-coding a slash 2015-12-14 22:58:11 -05:00
adam j hartz
a219009b2a don't insert a space when there is an ending quote 2015-12-14 22:52:30 -05:00
adam j hartz
c99ce807da hack to make completer almost work on readline 2015-12-14 22:20:44 -05:00
adam j hartz
509df99466 update string finding to use new function 2015-12-14 21:30:08 -05:00
adam j hartz
0f027cd476 some string finding stuff 2015-12-14 21:22:08 -05:00
adam j hartz
35bf1d77aa a couple of bugfixes (empty string, etc) 2015-12-14 17:52:09 -05:00
adam j hartz
754e638c08 preserve input quoting, rather than always using single quotes 2015-12-14 17:33:03 -05:00
adam j hartz
775e3c37a1 update prompt toolkit completer to accommodate new strings thing 2015-12-14 15:41:06 -05:00
adam j hartz
410c6e62e4 update completer to do a better job with strings 2015-12-14 15:40:47 -05:00
adam j hartz
fd992260bb just in case, for some reason, 'sudo time something' 2015-12-14 11:43:23 -05:00
Anthony Scopatz
795929ff0b Merge branch 'adqm-351' 2015-12-11 18:33:04 -05:00
adam j hartz
1fe64cd2d9 also fix for lambda args 2015-12-11 18:13:49 -05:00
adam j hartz
f8334a76b7 ast.arg needs lineno and col_offset in 3.5.1 2015-12-11 17:39:08 -05:00
adam j hartz
58e589d8da add some more version info to tools 2015-12-11 17:29:09 -05:00
Anthony Scopatz
846554ac9d Merge pull request #568 from gforsyth/completion_tweak
add `man` to completion skip tokens
2015-12-08 11:31:03 -05:00
Gil Forsyth
532480988b add man to completion skip tokens
Just a quick addition to allow tab completion when opening man pages
2015-12-08 11:25:57 -05:00
Anthony Scopatz
a567734e7b Merge pull request #564 from adqm/get_sep
Use get_sep function instead of repeating code
2015-12-07 23:24:23 -05:00
Anthony Scopatz
5dc5d192c5 Merge pull request #567 from adqm/xonsh_shell
Be more careful about __xonsh_shell__ (potential fix for #566)
2015-12-07 20:44:37 -05:00
adam j hartz
4ee496e5b3 potential fix for #566 2015-12-07 20:21:37 -05:00
adam j hartz
15f33e2d48 merge from master 2015-12-07 19:43:53 -05:00
adam j hartz
92985818b5 modify _collapsed_pwd to use tools.get_sep 2015-12-06 13:55:02 -05:00
Anthony Scopatz
8a5304b706 Merge pull request #562 from adqm/executable_title
include the command being run in the default title
2015-12-05 20:12:48 -05:00
adam j hartz
71f0f69ce4 ignore 'sudo' in command name 2015-12-05 18:49:04 -05:00
adam j hartz
4d9024d9f6 don't try to update title based on current command if we're storing stdout 2015-12-05 18:44:19 -05:00
Anthony Scopatz
3c9a173553 Merge pull request #561 from gforsyth/completion_wrap
Bash Completer $XONSH_TOKEN wrapping
2015-12-05 18:32:54 -05:00
Gil Forsyth
75672be2d2 add get_sep to tools and use in completionwrap 2015-12-05 18:25:25 -05:00
adam j hartz
5c6cfba70e Merge branch 'executable_title' of https://github.com/adqm/xonsh into executable_title 2015-12-05 16:28:27 -05:00
adam j hartz
6d2d5e030b small bit of documentation for current_job 2015-12-05 15:37:00 -05:00
adam j hartz
07176d664d update tests to have __xonsh_shell__ 2015-12-05 15:32:38 -05:00
adam j hartz
0c132528c4 fix for failing import tests? 2015-12-05 13:58:54 -05:00
adam j hartz
0a46ebf54f include the command being run in the title 2015-12-05 13:39:31 -05:00
Gil Forsyth
09702594a1 move completion wrap expression to separate function 2015-12-05 12:37:56 -05:00
Gil Forsyth
72170c5f30 remove unnecessarily complicated conditional 2015-12-04 17:33:37 -05:00
Gil Forsyth
f5b86b6a0f add set of completion wrap tokens for bash escape
I've noticed a few more problems in the way that the xonsh parser can
interfere with bash completion (or vice versa).  This adds a set of
tokens that might show up in filenames that cause trouble.  If one of
these tokens is in a filename/path then the bash completer will return
the `repr` of the filename and the xonsh parser won't try to interpret
the special symbols in the filename
2015-12-04 17:11:17 -05:00
Gil Forsyth
4651e66154 add space escaping to bash completion function
On Linux, if there's a foldername with a space in it, like "bad folder"
then tab-completion using `cd` will wrap single quotes around the name,
e.g.

```
cd bad(TAB)
```

completes to

```
cd 'bad folder/'
```

This behavior is encoded in `path_complete` in `completer.py`.  But if
you want to remove that poorly named folder, the argument to `rm` is
completed by `bash_complete` which didn't have this tweak and so the
result is

```
rm -r bad(TAB)
```
leads to

```
rm -r bad folder
/usr/bin/rm: cannot remove 'bad': No such file or directory
/usr/bin/rm: cannot remove 'folder/': No such file or directory
```

This tweaks the `bash_complete` function so that

```
rm -r bad(TAB)
```

returns

```
rm -r 'bad folder/'
```
2015-12-04 15:34:55 -05:00
Anthony Scopatz
d3447bef08 Merge branch 'adqm-cd_error' 2015-12-04 11:42:31 -05:00
adam j hartz
d66d525775 dirstack command returncodes, plus fix bug with dirs -c 2015-12-04 11:31:58 -05:00
adam j hartz
6677da9af7 Merge branch 'cd_error' of https://github.com/adqm/xonsh into cd_error 2015-12-04 11:19:15 -05:00
Anthony Scopatz
bb5c417267 Merge pull request #556 from scopatz/update_conda_install_docs
Added xonsh channel to the conda install documentation.
2015-12-04 09:36:17 -05:00
adam j hartz
2b6e260968 error on trying to cd to directory without executable bit 2015-12-04 08:12:29 -05:00
Morten Enemark Lund
2439c48f9f Added xonsh channel to the conda install documentation. 2015-12-04 11:22:44 +01:00
Anthony Scopatz
6e98119c46 Merge pull request #555 from scopatz/conda_build
Update conda recipes
2015-12-03 19:33:09 -05:00
Morten Enemark Lund
5d19bed903 Remove the Menu entry since it only works for windows. 2015-12-04 00:19:17 +01:00
Morten Enemark Lund
f7081ac853 Update conda recipes
Removed the app entry in meta.yaml, since this feature is not very mature. Instead added a menu item entry to start xonsh.
2015-12-03 22:30:27 +01:00
Morten Enemark Lund
0b007a0c70 Merge pull request #553 from scopatz/funcscmd
fixes bash funcscmd to allow for spaces in filenames
2015-12-03 08:28:52 +01:00
Anthony Scopatz
bb91e05f55 seems to work 2015-12-02 17:33:22 -05:00
Anthony Scopatz
979b9a7ba5 win try1 2015-12-02 17:30:28 -05:00
Anthony Scopatz
582a13e96e win try0 2015-12-02 17:18:19 -05:00