feature/lookup: rewrite dash docset integration
+ Uses alist variable to store config, rather than hooks + Added check for installed docsets in +lookup/documentation + Set docsets for various language modules (c-mode, c++-mode, css-mode, scss-mode, sass-mode, web-mode, go-mode, racket-mode, emacs-lisp-mode, js2-mode, rjsx-mode, typescript-mode, rust-mode, and php-mode) + Made *eww* popups for dash docsets larger + Renamed set-docset! => set-docsets! (set-docset! is aliased to set-docsets!) + New +lookup/install-docset alias
This commit is contained in:
parent
2df2622329
commit
fd8f8c5108
13 changed files with 119 additions and 35 deletions
|
@ -41,6 +41,8 @@ compilation database is present in the project.")
|
|||
|
||||
:config
|
||||
(set-electric! '(c-mode c++-mode objc-mode java-mode) :chars '(?\n ?\}))
|
||||
(set-docsets! 'c-mode "C")
|
||||
(set-docsets! 'c++-mode "C++" "Boost")
|
||||
|
||||
(set-pretty-symbols! '(c-mode c++-mode)
|
||||
;; Functional
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
(set-lookup-handlers! 'emacs-lisp-mode
|
||||
:definition #'elisp-def
|
||||
:documentation #'info-lookup-symbol)
|
||||
(set-docset! 'emacs-lisp-mode "Emacs Lisp")
|
||||
(set-docsets! 'emacs-lisp-mode "Emacs Lisp")
|
||||
(set-pretty-symbols! 'emacs-lisp-mode :lambda "lambda")
|
||||
(set-rotate-patterns! 'emacs-lisp-mode
|
||||
:symbols '(("t" "nil")
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
(after! go-mode
|
||||
(set-env! "GOPATH" "GOROOT")
|
||||
(set-docsets! 'go-mode "Go")
|
||||
(set-repl-handler! 'go-mode #'gorepl-run)
|
||||
(set-lookup-handlers! 'go-mode
|
||||
:definition #'go-guru-definition
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
;;; lang/javascript/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +javascript-docsets
|
||||
'("JavaScript"
|
||||
"AngularJS" "Backbone" "BackboneJS" "Bootstrap" "D3JS" "EmberJS" "Express"
|
||||
"ExtJS" "JQuery" "JQuery_Mobile" "JQuery_UI" "KnockoutJS" "Lo-Dash"
|
||||
"MarionetteJS" "MomentJS" "NodeJS" "PrototypeJS" "React" "RequireJS"
|
||||
"SailsJS" "UnderscoreJS" "VueJS" "ZeptoJS")
|
||||
"A list of dash docsets to use for Javascript modes (`js2-mode' and
|
||||
`rjsx-mode'). These are used by `+lookup/in-docsets'.")
|
||||
|
||||
(after! (:any js2-mode web-mode)
|
||||
(set-pretty-symbols! '(js2-mode web-mode)
|
||||
;; Functional
|
||||
|
@ -46,6 +55,7 @@
|
|||
|
||||
(set-electric! 'js2-mode :chars '(?\} ?\) ?. ?:))
|
||||
(set-repl-handler! 'js2-mode #'+javascript/repl)
|
||||
(set-docsets! 'js2-mode +javascript-docsets)
|
||||
|
||||
(map! :map js2-mode-map
|
||||
:localleader
|
||||
|
@ -66,6 +76,7 @@
|
|||
(add-to-list 'magic-mode-alist '(+javascript-jsx-file-p . rjsx-mode))
|
||||
:config
|
||||
(set-electric! 'rjsx-mode :chars '(?\} ?\) ?. ?>))
|
||||
(set-docsets! 'rjsx-mode +javascript-docsets)
|
||||
(add-hook! 'rjsx-mode-hook
|
||||
;; jshint doesn't know how to deal with jsx
|
||||
(push 'javascript-jshint flycheck-disabled-checkers))
|
||||
|
@ -86,6 +97,7 @@
|
|||
comment-line-break-function #'js2-line-break)
|
||||
(set-electric! 'typescript-mode
|
||||
:chars '(?\} ?\)) :words '("||" "&&"))
|
||||
(set-docsets! 'typescript-mode "TypeScript" "AngularTS")
|
||||
(set-pretty-symbols! 'typescript-mode
|
||||
;; Functional
|
||||
:def "function"
|
||||
|
@ -106,6 +118,8 @@
|
|||
|
||||
;; `coffee-mode'
|
||||
(setq coffee-indent-like-python-mode t)
|
||||
(after! coffee-mode
|
||||
(set-docsets! 'coffee-mode "CoffeeScript"))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;; php+html. Use the .phtml
|
||||
(setq php-template-compatibility nil)
|
||||
|
||||
(set-docsets! 'php-mode "PHP" "PHPUnit" "Laravel" "CakePHP" "CodeIgniter" "Doctrine_ORM")
|
||||
(set-repl-handler! 'php-mode #'php-boris)
|
||||
(set-lookup-handlers! 'php-mode :documentation #'php-search-documentation)
|
||||
(set-formatter! 'php-mode #'php-cs-fixer-fix)
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
(set-lookup-handlers! 'racket-mode
|
||||
:definition #'racket-visit-definition
|
||||
:documentation #'racket-describe)
|
||||
(set-docset! 'racket-mode "Racket")
|
||||
(set-docsets! 'racket-mode "Racket")
|
||||
(set-pretty-symbols! 'racket-mode
|
||||
:lambda "lambda"
|
||||
:map "map"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(after! rust-mode
|
||||
(set-env! "RUST_SRC_PATH")
|
||||
(set-docset! 'rust-mode "Rust")
|
||||
(set-docsets! 'rust-mode "Rust")
|
||||
(setq rust-indent-method-chain t)
|
||||
|
||||
(map! :map rust-mode-map
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
;;; lang/web/+css.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +web-css-docsets '("CSS" "HTML" "Bourbon" "Compass")
|
||||
"TODO")
|
||||
|
||||
;; An improved newline+continue comment function
|
||||
(setq-hook! css-mode comment-indent-function #'+css/comment-indent-new-line)
|
||||
|
||||
|
@ -33,10 +36,10 @@
|
|||
:defer t
|
||||
:config
|
||||
;; contains both css-mode & scss-mode
|
||||
(set-docset! 'css-mode "CSS")
|
||||
(set-docset! 'scss-mode "Sass")
|
||||
(set-docsets! 'css-mode +web-css-docsets)
|
||||
(set-docsets! 'scss-mode "Sass" +web-css-docsets)
|
||||
(unless EMACS26+
|
||||
;; css-mode's built in completion is superior
|
||||
;; css-mode's built in completion is superior in 26+
|
||||
(set-company-backend! '(css-mode scss-mode) 'company-css))
|
||||
(map! :map scss-mode-map :localleader :n "b" #'+css/scss-build))
|
||||
|
||||
|
@ -44,7 +47,7 @@
|
|||
(def-package! sass-mode
|
||||
:defer t
|
||||
:config
|
||||
(set-docset! 'sass-mode "Sass")
|
||||
(set-docsets! 'sass-mode "Sass" +web-css-docsets)
|
||||
(set-company-backend! 'sass-mode 'company-css)
|
||||
(map! :map scss-mode-map :localleader :n "b" #'+css/sass-build))
|
||||
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
:mode "wp-content/themes/.+/.+\\.php$"
|
||||
:mode "templates/.+\\.php$"
|
||||
:config
|
||||
(set-docsets! 'web-mode "HTML" "Twig" "WordPress")
|
||||
|
||||
(setq web-mode-enable-html-entities-fontification t
|
||||
web-mode-auto-close-style 2)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue