Merge rjsx-mode pretty-symbols with pre-existing

This commit is contained in:
Henrik Lissner 2018-09-03 23:56:25 +02:00 committed by GitHub
parent 37b920f461
commit 10b22b9750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,8 +9,8 @@
"A list of dash docsets to use for Javascript modes (`js2-mode' and "A list of dash docsets to use for Javascript modes (`js2-mode' and
`rjsx-mode'). These are used by `+lookup/in-docsets'.") `rjsx-mode'). These are used by `+lookup/in-docsets'.")
(after! (:any js2-mode web-mode) (after! (:any js2-mode rjsx-mode web-mode)
(set-pretty-symbols! '(js2-mode web-mode) (set-pretty-symbols! '(js2-mode rjsx-mode web-mode)
;; Functional ;; Functional
:def "function" :def "function"
:lambda "() =>" :lambda "() =>"
@ -82,22 +82,6 @@
;; jshint doesn't know how to deal with jsx ;; jshint doesn't know how to deal with jsx
(push 'javascript-jshint flycheck-disabled-checkers))) (push 'javascript-jshint flycheck-disabled-checkers)))
(set-pretty-symbols! 'rjsx-mode
;; Functional
:def "function"
:lambda "() =>"
:composition "compose"
;; Types
:null "null"
:true "true" :false "false"
;; Flow
:not "!"
:and "&&" :or "||"
:for "for"
:return "return"
;; Other
:yield "import")
;; `rjsx-electric-gt' relies on js2's parser to tell it when the cursor is in ;; `rjsx-electric-gt' relies on js2's parser to tell it when the cursor is in
;; a self-closing tag, so that it can insert a matching ending tag at point. ;; a self-closing tag, so that it can insert a matching ending tag at point.
;; However, the parser doesn't run immediately, so a fast typist can outrun ;; However, the parser doesn't run immediately, so a fast typist can outrun