colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add project-roots, make it so that jedi adds some virtualenvs whenever it starts up. Generally make emacs-jedi more sophisticated.

Browse Source
This commit is contained in:
Ivan Malison 2014-10-10 03:57:16 -07:00
parent bb1807256f
commit 251dbaed92
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -14,4 +14,5 @@ elpa/*
.mc-lists.el .mc-lists.el
.python-environments/ .python-environments/
tramp tramp
server server
.project-roots

34
init.el
View File

@ -35,7 +35,7 @@
'("marmalade" . "http://marmalade-repo.org/packages/")) '("marmalade" . "http://marmalade-repo.org/packages/"))
(package-initialize) (package-initialize)
(defvar my-packages '(color-theme ctags ctags-update flymake mo-git-blame (defvar my-packages '(color-theme cl-lib ctags ctags-update flymake mo-git-blame
multiple-cursors latex-preview-pane multiple-cursors latex-preview-pane
starter-kit-bindings starter-kit-ruby starter-kit-bindings starter-kit-ruby
starter-kit magit ido-ubiquitous starter-kit magit ido-ubiquitous
@ -44,7 +44,7 @@
smex solarized-theme zenburn-theme smex solarized-theme zenburn-theme
scala-mode2 ensime monokai-theme scala-mode2 ensime monokai-theme
gitconfig-mode jedi flymake-cursor pytest gitconfig-mode jedi flymake-cursor pytest
auto-complete) auto-complete project-root dart-mode popup)
"Packages that must be installed at launch.") "Packages that must be installed at launch.")
(defun ensure-package-installed (packages) (defun ensure-package-installed (packages)
@ -123,7 +123,17 @@ Return a list of installed packages or nil for every package not installed."
'(lambda () (setq debug-on-error t))) '(lambda () (setq debug-on-error t)))
(latex-preview-pane-enable) (latex-preview-pane-enable)
;; (add-hook 'latex-mode-hook (lambda () (global-set-key (kbd "M-n") ))
(require 'project-root)
(setq project-roots
`(("Tox Project"
:root-contains-files ("tox.ini")
:filename-regex (regexify-ext-list '(py)))
("Python Project"
:root-contains-files (".git" "setup.py")
:filename-regex (regexify-ext-list '(py)))
("Git project"
:root-contains-files (".git"))))
;; ============================================================================= ;; =============================================================================
;; Misc ;; Misc
@ -210,6 +220,24 @@ Return a list of installed packages or nil for every package not installed."
(add-hook 'python-mode-hook 'jedi:setup) (add-hook 'python-mode-hook 'jedi:setup)
(setq jedi:complete-on-dot t) (setq jedi:complete-on-dot t)
(defun add-virtual-envs-to-jedi-server ()
(let ((virtual-envs (get-virtual-envs)))
(when virtual-envs (set (make-local-variable 'jedi:server-args)
(make-virtualenv-args virtual-envs)))))
(defun make-virtualenv-args (virtual-envs)
(apply #'append (mapcar (lambda (env) `("-v" ,env)) virtual-envs)))
(defun get-virtual-envs ()
(interactive)
(let ((project-root (with-project-root (cdr project-details))))
(cl-remove-if-not 'file-exists-p
(mapcar (lambda (env-suffix) (concat project-root env-suffix))
'(".tox/py27/" "env")))))
(add-hook 'python-mode-hook 'add-virtual-envs-to-jedi-server)
;; Macros ;; Macros
(fset 'ipdb "import ipdb; ipdb.set_trace()") (fset 'ipdb "import ipdb; ipdb.set_trace()")
(fset 'main "if __name__ == '__main__':") (fset 'main "if __name__ == '__main__':")