Commit graph

3231 commits

Author SHA1 Message Date
Nicolas Avrutin
eeca87ed1a Return empty set instead of None when no python completions match.
This avoids this error when (for example) completing "rm":
Traceback (most recent call last):
  File "/usr/lib/python3.5/threading.py", line 914, in _bootstrap_inner
    self.run()
  File "/usr/lib/python3.5/threading.py", line 862, in run
    self._target(*self._args, **self._kwargs)
  File "/usr/lib/python3.5/site-packages/prompt_toolkit/interface.py", line 759, in run
    completions = list(buffer.completer.get_completions(document,complete_event))
  File "/usr/lib/python3.5/site-packages/xonsh/ptk/completer.py", line 36, in get_completions
    self.ctx)
  File "/usr/lib/python3.5/site-packages/xonsh/completer.py", line 41, in complete
    out = func(prefix, line, begidx, endidx, ctx)
  File "/usr/lib/python3.5/site-packages/xonsh/completers/base.py", line 21, in complete_base
    complete_command(prefix, line, start, end, ctx))
TypeError: unsupported operand type(s) for |: 'NoneType' and 'set'
2016-06-05 16:31:54 -04:00
Gil Forsyth
0cb90f2ecd make CONTRIBUTING a hard link
GitHub is weird about symlinks and I think this better represents the
desired behavior (if you click CONTRIBUTING, you should see the dev
guide)
2016-06-05 16:22:05 -04:00
Morten Enemark Lund
33a5208702 Merge pull request #1114 from scopatz/update_osx_docs
add brew install instructions to docs
2016-06-05 22:05:00 +02:00
Gil Forsyth
b4633c60b7 add brew install instructions to docs 2016-06-05 15:48:46 -04:00
Gil Forsyth
70eb47b859 Merge pull request #1113 from rahiel/master
environ.py: fix typo
2016-06-05 12:08:12 -07:00
Rahiel Kasim
e6b5c57d8b environ.py: fix typo 2016-06-05 21:00:56 +02:00
Hugo Wang
6af4114025 updated comments 2016-06-05 17:48:58 +08:00
Anthony Scopatz
f65b33e838 Merge branch 'ns' 2016-06-05 03:12:02 -04:00
Anthony Scopatz
802f5e729d hotfix for #1108 2016-06-05 02:30:14 -04:00
Hugo Wang
9c89453d3a made defines separated of _send_signal 2016-06-05 14:12:05 +08:00
Hugo Wang
07277e7bf2 remove unused imports 2016-06-05 11:51:33 +08:00
Hugo Wang
6503e93308 changed to use solution from @Carreau 2016-06-05 11:48:35 +08:00
adam j hartz
d22ca695e4 add changelog entry 2016-06-04 23:07:22 -04:00
Anthony Scopatz
0dcd929392 Merge branch 'VHarisop-master' 2016-06-04 23:04:13 -04:00
Hugo Wang
1668d7aecb prevent killpg PermissionError crash on OSX 2016-06-05 10:56:42 +08:00
VHarisop
0dda15e303
Fixes shell_type override in #1072 2016-06-05 05:48:00 +03:00
Anthony Scopatz
655e4970a3 People xonshtantly mispronounce these things. 2016-06-04 22:37:51 -04:00
Anthony Scopatz
ee9c10101f taco shell 2016-06-04 22:34:27 -04:00
Anthony Scopatz
7a72bcd505 Merge branch 'wjwwood-fix_missing_bash_comp_dirs' 2016-06-04 22:06:27 -04:00
William Woodall
2e230c8bc3 do not require directories in BASH_COMPLETIONS to exist 2016-06-04 18:56:20 -07:00
Anthony Scopatz
e9a2b96ddb Merge pull request #1037 from arielf/master
xonsh/history.py: apply os.path.expanduser to XONSH_DATA_DIR in history
2016-06-04 17:39:44 -07:00
Anthony Scopatz
231c7f0a6e add completer API doc hooks 2016-06-04 20:05:55 -04:00
Anthony Scopatz
08483fdcc3 Merge branch 'adqm-faster_bash_completers' 2016-06-04 19:38:20 -04:00
Anthony Scopatz
84f9d49e2e Merge branch 'faster_bash_completers' of https://github.com/adqm/xonsh into adqm-faster_bash_completers 2016-06-04 19:32:48 -04:00
Anthony Scopatz
afe2aca7f6 Merge pull request #1098 from kirbyfan64/which-cat
Mention how to mix commands and variables/text
2016-06-04 16:12:24 -07:00
Gil Forsyth
bbd976f742 fix padding and standardize docstring newlines 2016-06-04 18:51:10 -04:00
Ryan Gonzalez
418b863f82 Mention how to mix commands and variables/text 2016-06-04 17:20:06 -05:00
Gil Forsyth
b79fa5d2ea update justify function using textwrap 2016-06-04 18:02:01 -04:00
adam j hartz
5b9e3adfda update docs 2016-06-04 16:58:46 -04:00
adam j hartz
34c159b4db fix: make bash completer use cache loaded at startup 2016-06-04 16:55:49 -04:00
adam j hartz
64e49d11b3 don't shadow 'dir' 2016-06-04 16:48:00 -04:00
adam j hartz
079e07d27b some more changes, per @scopatz's suggestions 2016-06-04 16:47:01 -04:00
adam j hartz
abff768d44 restructure completer aliases 2016-06-04 16:39:13 -04:00
adam j hartz
61af45682c update tests for man page completion 2016-06-04 16:07:03 -04:00
Anthony Scopatz
1bf8c50d28 Merge branch 'syntax_error_pointer' 2016-06-04 16:05:33 -04:00
adam j hartz
fa0022dac5 better check for iterable 2016-06-04 15:57:43 -04:00
adam j hartz
bff709eef3 more operators to auto-complete 2016-06-04 15:54:18 -04:00
adam j hartz
e85037be3d move cache location for man completer 2016-06-04 15:53:12 -04:00
adam j hartz
fe6a091295 remove unused code 2016-06-04 15:47:36 -04:00
adam j hartz
5027f8a41a smarter creation/updates of completers dict 2016-06-04 15:47:01 -04:00
Gil Forsyth
4ac3dd2b7c update changelog 2016-06-04 15:46:02 -04:00
Gil Forsyth
b51d8c64ef add visual pointer to syntax error message 2016-06-04 15:44:46 -04:00
adam j hartz
5cec29b9e9 better check for non-empty result 2016-06-04 15:44:08 -04:00
adam j hartz
8a6fe5d329 more sensible structuring of wrap_subprocs arg, per @scopatz' suggestions 2016-06-04 15:42:56 -04:00
adam j hartz
cf188bf13c BASH -> Bash everywhere 2016-06-04 15:36:21 -04:00
Anthony Scopatz
3caed0c02c Merge pull request #1093 from scopatz/xonfig_addition
add current shell_type to xonfig output
2016-06-04 11:46:52 -07:00
Anthony Scopatz
440d2a6766 Merge branch 'adqm-readline' 2016-06-04 13:59:41 -04:00
adam j hartz
9c4b476b7a merge from master 2016-06-04 13:38:09 -04:00
adam j hartz
16b68e7b6d print error message to stderr 2016-06-04 13:34:01 -04:00
adam j hartz
ca59e56cd6 use importlib for imports 2016-06-04 13:32:32 -04:00