mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-28 07:45:00 +00:00
1143232265
* lisp/allout-widgets.el (allout-widgets-auto-activation) (allout-current-decorated-p): * lisp/auth-source.el (auth-source-protocols): * lisp/autorevert.el (auto-revert-set-timer): * lisp/battery.el (battery-mode-line-limit): * lisp/calc/calcalg3.el (math-map-binop): * lisp/calendar/cal-dst.el (calendar-dst-find-startend): * lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute): * lisp/calendar/calendar.el (calendar-date-echo-text) (calendar-generate-month, calendar-string-spread) (calendar-cursor-to-date, calendar-read, calendar-read-date) (calendar-mark-visible-date, calendar-dayname-on-or-before): * lisp/calendar/diary-lib.el (diary-ordinal-suffix): * lisp/cedet/ede/autoconf-edit.el (autoconf-new-program) (autoconf-find-last-macro, autoconf-parameter-strip): * lisp/cedet/ede/config.el (ede-target-with-config-build): * lisp/cedet/ede/linux.el (ede-linux--detect-architecture) (ede-linux--get-architecture): * lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache) (semantic-displayer-abstract, semantic-displayer-point-position): * lisp/cedet/semantic/format.el (semantic-format-face-alist) (semantic-format-tag-short-doc): * lisp/cedet/semantic/fw.el (semantic-find-file-noselect): * lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time) (semantic-idle-breadcrumbs-display-function) (semantic-idle-breadcrumbs-format-tag-list-function): * lisp/cedet/semantic/lex.el (semantic-lex-map-types) (define-lex, define-lex-block-type-analyzer): * lisp/cedet/semantic/senator.el (senator-search-default-tag-filter): * lisp/cedet/semantic/symref.el (semantic-symref-result) (semantic-symref-hit-to-tag-via-db): * lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass): * lisp/cedet/semantic/tag.el (semantic-tag-new-variable) (semantic-tag-new-include, semantic-tag-new-package) (semantic-tag-set-faux, semantic-create-tag-proxy) (semantic-tag-function-parent) (semantic-tag-components-with-overlays): * lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces) (srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict): * lisp/cedet/srecode/dictionary.el (srecode-create-dictionary) (srecode-dictionary-add-entries, srecode-dictionary-lookup-name) (srecode-create-dictionaries-from-tags): * lisp/cmuscheme.el (scheme-compile-region): * lisp/color.el (color-lab-to-lch): * lisp/doc-view.el (doc-view-image-width) (doc-view-set-up-single-converter): * lisp/dynamic-setting.el (font-setting-change-default-font) (dynamic-setting-handle-config-changed-event): * lisp/elec-pair.el (electric-pair-text-pairs) (electric-pair-skip-whitespace-function) (electric-pair-string-bound-function): * lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance) (avl-tree-member, avl-tree-mapcar, avl-tree-iter): * lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree): * lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag) (checkdoc-spellcheck-documentation-flag, checkdoc-ispell) (checkdoc-ispell-current-buffer, checkdoc-ispell-interactive) (checkdoc-ispell-message-interactive) (checkdoc-ispell-message-text, checkdoc-ispell-start) (checkdoc-ispell-continue, checkdoc-ispell-comments) (checkdoc-ispell-defun): * lisp/emacs-lisp/cl-generic.el (cl--generic-search-method): * lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group): * lisp/emacs-lisp/lisp.el (forward-sexp, up-list): * lisp/emacs-lisp/package-x.el (package--archive-contents-from-file): * lisp/emacs-lisp/package.el (package-desc) (package--make-autoloads-and-stuff, package-hidden-regexps): * lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup): * lisp/emacs-lisp/testcover.el (testcover-nohits) (testcover-1value): * lisp/epg.el (epg-receive-keys, epg-start-edit-key): * lisp/erc/erc-backend.el (erc-server-processing-p) (erc-split-line-length, erc-server-coding-system) (erc-server-send, erc-message): * lisp/erc/erc-button.el (erc-button-face, erc-button-alist) (erc-browse-emacswiki): * lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login): * lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation): * lisp/erc/erc-log.el (erc-current-logfile): * lisp/erc/erc-match.el (erc-log-match-format) (erc-text-matched-hook): * lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug): * lisp/erc/erc-networks.el (erc-server-alist) (erc-networks-alist, erc-current-network): * lisp/erc/erc-ring.el (erc-input-ring-index): * lisp/erc/erc-speedbar.el (erc-speedbar) (erc-speedbar-update-channel): * lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag): * lisp/erc/erc-track.el (erc-track-position-in-mode-line) (erc-track-remove-from-mode-line, erc-modified-channels-update) (erc-track-last-non-erc-buffer, erc-track-sort-by-importance) (erc-track-get-active-buffer): * lisp/erc/erc.el (erc-get-channel-user-list) (erc-echo-notice-hook, erc-echo-notice-always-hook) (erc-wash-quit-reason, erc-format-@nick): * lisp/ffap.el (ffap-latex-mode): * lisp/files.el (abort-if-file-too-large) (dir-locals--get-sort-score, buffer-stale--default-function): * lisp/filesets.el (filesets-tree-max-level, filesets-data) (filesets-update-pre010505): * lisp/gnus/gnus-agent.el (gnus-agent-flush-cache): * lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol) (gnus-button-prefer-mid-or-mail): * lisp/gnus/gnus-cus.el (gnus-group-parameters): * lisp/gnus/gnus-demon.el (gnus-demon-handlers) (gnus-demon-run-callback): * lisp/gnus/gnus-dired.el (gnus-dired-print): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer): * lisp/gnus/gnus-range.el (gnus-range-normalize): * lisp/gnus/gnus-spec.el (gnus-pad-form): * lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud) (gnus-server-opened, gnus-server-closed, gnus-server-denied) (gnus-server-offline): * lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir) (gnus-refer-thread-limit-to-thread) (gnus-summary-limit-include-thread, gnus-summary-refer-thread) (gnus-summary-find-matching): * lisp/gnus/gnus-util.el (gnus-rescale-image): * lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server): * lisp/gnus/mail-source.el (mail-source-incoming-file-prefix): * lisp/gnus/message.el (message-cite-reply-position) (message-cite-style-outlook, message-cite-style-thunderbird) (message-cite-style-gmail, message--send-mail-maybe-partially): * lisp/gnus/mm-extern.el (mm-inline-external-body): * lisp/gnus/mm-partial.el (mm-inline-partial): * lisp/gnus/mml-sec.el (mml-secure-message-sign) (mml-secure-message-sign-encrypt, mml-secure-message-encrypt): * lisp/gnus/mml2015.el (mml2015-epg-key-image) (mml2015-epg-key-image-to-string): * lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail): * lisp/gnus/nnheader.el (nnheader-directory-files-is-safe): * lisp/gnus/nnir.el (nnir-search-history) (nnir-imap-search-other, nnir-artlist-length) (nnir-artlist-article, nnir-artitem-group, nnir-artitem-number) (nnir-artitem-rsv, nnir-article-group, nnir-article-number) (nnir-article-rsv, nnir-article-ids, nnir-categorize) (nnir-retrieve-headers-override-function) (nnir-imap-default-search-key, nnir-hyrex-additional-switches) (gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms) (nnir-read-parm, nnir-read-server-parm, nnir-search-thread): * lisp/gnus/nnmairix.el (nnmairix-default-group) (nnmairix-propagate-marks): * lisp/gnus/smime.el (smime-keys, smime-crl-check) (smime-verify-buffer, smime-noverify-buffer): * lisp/gnus/spam-report.el (spam-report-url-ping-mm-url): * lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header) (spam-spamassassin-spam-status-header, spam-sa-learn-rebuild) (spam-classifications, spam-check-stat, spam-spamassassin-score): * lisp/help.el (describe-minor-mode-from-symbol): * lisp/hippie-exp.el (hippie-expand-ignore-buffers): * lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face) (hfy-begin-span): * lisp/ibuf-ext.el (ibuffer-update-saved-filters-format) (ibuffer-saved-filters, ibuffer-old-saved-filters-warning) (ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters) (eval, ibuffer-unary-operand, file-extension, directory): * lisp/image-dired.el (image-dired-cmd-pngcrush-options): * lisp/image-mode.el (image-toggle-display): * lisp/international/ccl.el (ccl-compile-read-multibyte-character) (ccl-compile-write-multibyte-character): * lisp/international/kkc.el (kkc-save-init-file): * lisp/international/latin1-disp.el (latin1-display): * lisp/international/ogonek.el (ogonek-name-encoding-alist) (ogonek-information, ogonek-lookup-encoding) (ogonek-deprefixify-region): * lisp/isearch.el (isearch-filter-predicate) (isearch--momentary-message): * lisp/jsonrpc.el (jsonrpc-connection-send) (jsonrpc-process-connection, jsonrpc-shutdown) (jsonrpc--async-request-1): * lisp/language/tibet-util.el (tibetan-char-p): * lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date) (feedmail-last-chance-hook, feedmail-before-fcc-hook) (feedmail-send-it-immediately-wrapper, feedmail-find-eoh): * lisp/mail/hashcash.el (hashcash-generate-payment) (hashcash-generate-payment-async, hashcash-insert-payment) (hashcash-verify-payment): * lisp/mail/rmail.el (rmail-movemail-variant-in-use) (rmail-get-attr-value): * lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime): * lisp/mail/rmailsum.el (rmail-summary-show-message): * lisp/mail/supercite.el (sc-raw-mode-toggle): * lisp/man.el (Man-start-calling): * lisp/mh-e/mh-acros.el (mh-do-at-event-location) (mh-iterate-on-messages-in-region, mh-iterate-on-range): * lisp/mh-e/mh-alias.el (mh-alias-system-aliases) (mh-alias-reload, mh-alias-ali) (mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file) (mh-alias-add-alias): * lisp/mouse.el (mouse-save-then-kill): * lisp/net/browse-url.el (browse-url-default-macosx-browser): * lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value) (eudc-variable-server-value, eudc-update-variable) (eudc-expand-inline): * lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): * lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list): * lisp/net/pop3.el (pop3-list): * lisp/net/soap-client.el (soap-namespace-put) (soap-xs-parse-sequence, soap-parse-envelope): * lisp/net/soap-inspect.el (soap-inspect-xs-complex-type): * lisp/nxml/rng-xsd.el (rng-xsd-date-to-days): * lisp/org/ob-C.el (org-babel-prep-session:C) (org-babel-load-session:C): * lisp/org/ob-J.el (org-babel-execute:J): * lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote): * lisp/org/ob-awk.el (org-babel-execute:awk): * lisp/org/ob-core.el (org-babel-process-file-name): * lisp/org/ob-ebnf.el (org-babel-execute:ebnf): * lisp/org/ob-forth.el (org-babel-execute:forth): * lisp/org/ob-fortran.el (org-babel-execute:fortran) (org-babel-prep-session:fortran, org-babel-load-session:fortran): * lisp/org/ob-groovy.el (org-babel-execute:groovy): * lisp/org/ob-io.el (org-babel-execute:io): * lisp/org/ob-js.el (org-babel-execute:js): * lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond) (org-babel-lilypond-compile-post-tangle) (org-babel-lilypond-display-pdf-post-tangle) (org-babel-lilypond-tangle) (org-babel-lilypond-execute-tangled-ly) (org-babel-lilypond-compile-lilyfile) (org-babel-lilypond-check-for-compile-error) (org-babel-lilypond-process-compile-error) (org-babel-lilypond-mark-error-line) (org-babel-lilypond-parse-error-line) (org-babel-lilypond-attempt-to-open-pdf) (org-babel-lilypond-attempt-to-play-midi) (org-babel-lilypond-switch-extension) (org-babel-lilypond-set-header-args): * lisp/org/ob-lua.el (org-babel-prep-session:lua): * lisp/org/ob-picolisp.el (org-babel-execute:picolisp): * lisp/org/ob-processing.el (org-babel-prep-session:processing): * lisp/org/ob-python.el (org-babel-prep-session:python): * lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message) (org-babel-scheme-execute-with-geiser, org-babel-execute:scheme): * lisp/org/ob-shen.el (org-babel-execute:shen): * lisp/org/org-agenda.el (org-agenda-entry-types) (org-agenda-move-date-from-past-immediately-to-today) (org-agenda-time-grid, org-agenda-sorting-strategy) (org-agenda-filter-by-category, org-agenda-forward-block): * lisp/org/org-colview.el (org-columns--overlay-text): * lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces): * lisp/org/org-indent.el (org-indent-set-line-properties): * lisp/org/org-macs.el (org-get-limited-outline-regexp): * lisp/org/org-mobile.el (org-mobile-files): * lisp/org/org.el (org-use-fast-todo-selection) (org-extend-today-until, org-use-property-inheritance) (org-refresh-effort-properties, org-open-at-point-global) (org-track-ordered-property-with-tag, org-shiftright): * lisp/org/ox-html.el (org-html-checkbox-type): * lisp/org/ox-man.el (org-man-source-highlight) (org-man-verse-block): * lisp/org/ox-publish.el (org-publish-sitemap-default): * lisp/outline.el (outline-head-from-level): * lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1) (dcl-calc-command-indent, dcl-indent-to): * lisp/progmodes/flymake.el (flymake-make-diagnostic) (flymake--overlays, flymake-diagnostic-functions) (flymake-diagnostic-types-alist, flymake--backend-state) (flymake-is-running, flymake--collect, flymake-mode): * lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop) (gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer): * lisp/progmodes/grep.el (grep-error-screen-columns): * lisp/progmodes/gud.el (gud-prev-expr): * lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column) (ps-run-goto-error): * lisp/progmodes/python.el (python-eldoc-get-doc) (python-eldoc-function-timeout-permanent, python-eldoc-function): * lisp/shadowfile.el (shadow-make-group): * lisp/speedbar.el (speedbar-obj-do-check): * lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook): * lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib): * lisp/textmodes/reftex-index.el (reftex-index-goto-entry) (reftex-index-kill, reftex-index-undo): * lisp/textmodes/reftex-parse.el (reftex-context-substring): * lisp/textmodes/reftex.el (reftex-TeX-master-file): * lisp/textmodes/rst.el (rst-next-hdr, rst-toc) (rst-uncomment-region, rst-font-lock-extend-region-internal): * lisp/thumbs.el (thumbs-mode): * lisp/vc/ediff-util.el (ediff-restore-diff): * lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag): * lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p): * lisp/wid-edit.el (widget-field-value-set, string): * lisp/x-dnd.el (x-dnd-version-from-flags) (x-dnd-more-than-3-from-flags): Assorted docfixes.
649 lines
27 KiB
EmacsLisp
649 lines
27 KiB
EmacsLisp
;;; elec-pair.el --- Automatic parenthesis pairing -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
|
|
|
|
;; Author: João Távora <joaotavora@gmail.com>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'electric)
|
|
(eval-when-compile (require 'cl-lib))
|
|
|
|
;;; Electric pairing.
|
|
|
|
(defcustom electric-pair-pairs
|
|
`((?\" . ?\")
|
|
(,(nth 0 electric-quote-chars) . ,(nth 1 electric-quote-chars))
|
|
(,(nth 2 electric-quote-chars) . ,(nth 3 electric-quote-chars)))
|
|
"Alist of pairs that should be used regardless of major mode.
|
|
|
|
Pairs of delimiters in this list are a fallback in case they have
|
|
no syntax relevant to `electric-pair-mode' in the mode's syntax
|
|
table.
|
|
|
|
See also the variable `electric-pair-text-pairs'."
|
|
:version "24.1"
|
|
:group 'electricity
|
|
:type '(repeat (cons character character)))
|
|
|
|
(defcustom electric-pair-text-pairs
|
|
`((?\" . ?\")
|
|
(,(nth 0 electric-quote-chars) . ,(nth 1 electric-quote-chars))
|
|
(,(nth 2 electric-quote-chars) . ,(nth 3 electric-quote-chars)))
|
|
"Alist of pairs that should always be used in comments and strings.
|
|
|
|
Pairs of delimiters in this list are a fallback in case they have
|
|
no syntax relevant to `electric-pair-mode' in the syntax table
|
|
defined in `electric-pair-text-syntax-table'."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type '(repeat (cons character character)))
|
|
|
|
(defcustom electric-pair-skip-self #'electric-pair-default-skip-self
|
|
"If non-nil, skip char instead of inserting a second closing paren.
|
|
|
|
When inserting a closing paren character right before the same character,
|
|
just skip that character instead, so that hitting ( followed by ) results
|
|
in \"()\" rather than \"())\".
|
|
|
|
This can be convenient for people who find it easier to hit ) than C-f.
|
|
|
|
Can also be a function of one argument (the closer char just
|
|
inserted), in which case that function's return value is
|
|
considered instead."
|
|
:version "24.1"
|
|
:group 'electricity
|
|
:type '(choice
|
|
(const :tag "Never skip" nil)
|
|
(const :tag "Help balance" electric-pair-default-skip-self)
|
|
(const :tag "Always skip" t)
|
|
function))
|
|
|
|
(defcustom electric-pair-inhibit-predicate
|
|
#'electric-pair-default-inhibit
|
|
"Predicate to prevent insertion of a matching pair.
|
|
|
|
The function is called with a single char (the opening char just inserted).
|
|
If it returns non-nil, then `electric-pair-mode' will not insert a matching
|
|
closer."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type '(choice
|
|
(const :tag "Conservative" electric-pair-conservative-inhibit)
|
|
(const :tag "Help balance" electric-pair-default-inhibit)
|
|
(const :tag "Always pair" ignore)
|
|
function))
|
|
|
|
(defcustom electric-pair-preserve-balance t
|
|
"Non-nil if default pairing and skipping should help balance parentheses.
|
|
|
|
The default values of `electric-pair-inhibit-predicate' and
|
|
`electric-pair-skip-self' check this variable before delegating to other
|
|
predicates responsible for making decisions on whether to pair/skip some
|
|
characters based on the actual state of the buffer's parentheses and
|
|
quotes."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type 'boolean)
|
|
|
|
(defcustom electric-pair-delete-adjacent-pairs t
|
|
"If non-nil, backspacing an open paren also deletes adjacent closer.
|
|
|
|
Can also be a function of no arguments, in which case that function's
|
|
return value is considered instead."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type '(choice
|
|
(const :tag "Yes" t)
|
|
(const :tag "No" nil)
|
|
function))
|
|
|
|
(defcustom electric-pair-open-newline-between-pairs t
|
|
"If non-nil, a newline between adjacent parentheses opens an extra one.
|
|
|
|
Can also be a function of no arguments, in which case that function's
|
|
return value is considered instead."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type '(choice
|
|
(const :tag "Yes" t)
|
|
(const :tag "No" nil)
|
|
function))
|
|
|
|
(defcustom electric-pair-skip-whitespace t
|
|
"If non-nil skip whitespace when skipping over closing parens.
|
|
|
|
The specific kind of whitespace skipped is given by the variable
|
|
`electric-pair-skip-whitespace-chars'.
|
|
|
|
The symbol `chomp' specifies that the skipped-over whitespace
|
|
should be deleted.
|
|
|
|
Can also be a function of no arguments, in which case that function's
|
|
return value is considered instead."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type '(choice
|
|
(const :tag "Yes, jump over whitespace" t)
|
|
(const :tag "Yes, and delete whitespace" chomp)
|
|
(const :tag "No, no whitespace skipping" nil)
|
|
function))
|
|
|
|
(defcustom electric-pair-skip-whitespace-chars (list ?\t ?\s ?\n)
|
|
"Whitespace characters considered by `electric-pair-skip-whitespace'."
|
|
:version "24.4"
|
|
:group 'electricity
|
|
:type '(choice (set (const :tag "Space" ?\s)
|
|
(const :tag "Tab" ?\t)
|
|
(const :tag "Newline" ?\n))
|
|
(list character)))
|
|
|
|
(defvar-local electric-pair-skip-whitespace-function
|
|
#'electric-pair--skip-whitespace
|
|
"Function to use to skip whitespace forward.
|
|
Before attempting a skip, if `electric-pair-skip-whitespace' is
|
|
non-nil, this function is called. It move point to a new buffer
|
|
position, presumably skipping only whitespace in between.")
|
|
|
|
(defun electric-pair--skip-whitespace ()
|
|
"Skip whitespace forward, not crossing comment or string boundaries."
|
|
(let ((saved (point))
|
|
(string-or-comment (nth 8 (syntax-ppss))))
|
|
(skip-chars-forward (apply #'string electric-pair-skip-whitespace-chars))
|
|
(unless (eq string-or-comment (nth 8 (syntax-ppss)))
|
|
(goto-char saved))))
|
|
|
|
(defvar electric-pair-text-syntax-table prog-mode-syntax-table
|
|
"Syntax table used when pairing inside comments and strings.
|
|
|
|
`electric-pair-mode' considers this syntax table only when point in inside
|
|
quotes or comments. If lookup fails here, `electric-pair-text-pairs' will
|
|
be considered.")
|
|
|
|
(defun electric-pair-conservative-inhibit (char)
|
|
(or
|
|
;; I find it more often preferable not to pair when the
|
|
;; same char is next.
|
|
(eq char (char-after))
|
|
;; Don't pair up when we insert the second of "" or of ((.
|
|
(and (eq char (char-before))
|
|
(eq char (char-before (1- (point)))))
|
|
;; I also find it often preferable not to pair next to a word.
|
|
(eq (char-syntax (following-char)) ?w)))
|
|
|
|
(defun electric-pair-syntax-info (command-event)
|
|
"Calculate a list (SYNTAX PAIR UNCONDITIONAL STRING-OR-COMMENT-START).
|
|
|
|
SYNTAX is COMMAND-EVENT's syntax character. PAIR is
|
|
COMMAND-EVENT's pair. UNCONDITIONAL indicates the variables
|
|
`electric-pair-pairs' or `electric-pair-text-pairs' were used to
|
|
lookup syntax. STRING-OR-COMMENT-START indicates that point is
|
|
inside a comment or string."
|
|
(let* ((pre-string-or-comment (or (bobp)
|
|
(nth 8 (save-excursion
|
|
(syntax-ppss (1- (point)))))))
|
|
(post-string-or-comment (nth 8 (syntax-ppss (point))))
|
|
(string-or-comment (and post-string-or-comment
|
|
pre-string-or-comment))
|
|
(table (if string-or-comment
|
|
electric-pair-text-syntax-table
|
|
(syntax-table)))
|
|
(table-syntax-and-pair (with-syntax-table table
|
|
(list (char-syntax command-event)
|
|
(or (matching-paren command-event)
|
|
command-event))))
|
|
(fallback (if string-or-comment
|
|
(append electric-pair-text-pairs
|
|
electric-pair-pairs)
|
|
electric-pair-pairs))
|
|
(direct (assq command-event fallback))
|
|
(reverse (rassq command-event fallback)))
|
|
(cond
|
|
((memq (car table-syntax-and-pair)
|
|
'(?\" ?\( ?\) ?\$))
|
|
(append table-syntax-and-pair (list nil string-or-comment)))
|
|
(direct (if (eq (car direct) (cdr direct))
|
|
(list ?\" command-event t string-or-comment)
|
|
(list ?\( (cdr direct) t string-or-comment)))
|
|
(reverse (list ?\) (car reverse) t string-or-comment)))))
|
|
|
|
(defun electric-pair--insert (char)
|
|
(let ((last-command-event char)
|
|
(blink-matching-paren nil)
|
|
(electric-pair-mode nil)
|
|
;; When adding the "closer" delimiter, a job his function is
|
|
;; frequently used for, we don't want to munch any extra
|
|
;; newlines above us. That would be the default behaviour of
|
|
;; `electric-layout-mode', which potentially kicked in before
|
|
;; us to add these newlines, and is probably about to kick in
|
|
;; again after we add the closer.
|
|
(electric-layout-allow-duplicate-newlines t))
|
|
(self-insert-command 1)))
|
|
|
|
(cl-defmacro electric-pair--with-uncached-syntax ((table &optional start) &rest body)
|
|
"Like `with-syntax-table', but flush the syntax-ppss cache afterwards.
|
|
Use this instead of (with-syntax-table TABLE BODY) when BODY
|
|
contains code which may update the syntax-ppss cache. This
|
|
includes calling `parse-partial-sexp' and any sexp-based movement
|
|
functions when `parse-sexp-lookup-properties' is non-nil. The
|
|
cache is flushed from position START, defaulting to point."
|
|
(declare (debug ((form &optional form) body)) (indent 1))
|
|
(let ((start-var (make-symbol "start")))
|
|
`(let ((syntax-propertize-function #'ignore)
|
|
(,start-var ,(or start '(point))))
|
|
(unwind-protect
|
|
(with-syntax-table ,table
|
|
,@body)
|
|
(syntax-ppss-flush-cache ,start-var)))))
|
|
|
|
(defun electric-pair--syntax-ppss (&optional pos where)
|
|
"Like `syntax-ppss', but sometimes fallback to `parse-partial-sexp'.
|
|
|
|
WHERE is a list defaulting to '(string comment) and indicates
|
|
when to fallback to `parse-partial-sexp'."
|
|
(let* ((pos (or pos (point)))
|
|
(where (or where '(string comment)))
|
|
(quick-ppss (syntax-ppss pos))
|
|
(in-string (and (nth 3 quick-ppss) (memq 'string where)))
|
|
(in-comment (and (nth 4 quick-ppss) (memq 'comment where)))
|
|
(s-or-c-start (cond (in-string
|
|
(1+ (nth 8 quick-ppss)))
|
|
(in-comment
|
|
(goto-char (nth 8 quick-ppss))
|
|
(forward-comment (- (point-max)))
|
|
(skip-syntax-forward " >!")
|
|
(point)))))
|
|
(if s-or-c-start
|
|
(electric-pair--with-uncached-syntax (electric-pair-text-syntax-table
|
|
s-or-c-start)
|
|
(parse-partial-sexp s-or-c-start pos))
|
|
;; HACK! cc-mode apparently has some `syntax-ppss' bugs
|
|
(if (memq major-mode '(c-mode c++ mode))
|
|
(parse-partial-sexp (point-min) pos)
|
|
quick-ppss))))
|
|
|
|
;; Balancing means controlling pairing and skipping of parentheses
|
|
;; so that, if possible, the buffer ends up at least as balanced as
|
|
;; before, if not more. The algorithm is slightly complex because
|
|
;; some situations like "()))" need pairing to occur at the end but
|
|
;; not at the beginning. Balancing should also happen independently
|
|
;; for different types of parentheses, so that having your {}'s
|
|
;; unbalanced doesn't keep `electric-pair-mode' from balancing your
|
|
;; ()'s and your []'s.
|
|
(defun electric-pair--balance-info (direction string-or-comment)
|
|
"Examine lists forward or backward according to DIRECTION's sign.
|
|
|
|
STRING-OR-COMMENT is info suitable for running `parse-partial-sexp'.
|
|
|
|
Return a cons of two descriptions (MATCHED-P . PAIR) for the
|
|
innermost and outermost lists that enclose point. The outermost
|
|
list enclosing point is either the first top-level or first
|
|
mismatched list found by listing up.
|
|
|
|
If the outermost list is matched, don't rely on its PAIR.
|
|
If point is not enclosed by any lists, return ((t) . (t))."
|
|
(let* (innermost
|
|
outermost
|
|
(table (if string-or-comment
|
|
electric-pair-text-syntax-table
|
|
(syntax-table)))
|
|
(at-top-level-or-equivalent-fn
|
|
;; called when `scan-sexps' ran perfectly, when it found
|
|
;; a parenthesis pointing in the direction of travel.
|
|
;; Also when travel started inside a comment and exited it.
|
|
#'(lambda ()
|
|
(setq outermost (list t))
|
|
(unless innermost
|
|
(setq innermost (list t)))))
|
|
(ended-prematurely-fn
|
|
;; called when `scan-sexps' crashed against a parenthesis
|
|
;; pointing opposite the direction of travel. After
|
|
;; traversing that character, the idea is to travel one sexp
|
|
;; in the opposite direction looking for a matching
|
|
;; delimiter.
|
|
#'(lambda ()
|
|
(let* ((pos (point))
|
|
(matched
|
|
(save-excursion
|
|
(cond ((< direction 0)
|
|
(condition-case nil
|
|
(eq (char-after pos)
|
|
(electric-pair--with-uncached-syntax
|
|
(table)
|
|
(matching-paren
|
|
(char-before
|
|
(scan-sexps (point) 1)))))
|
|
(scan-error nil)))
|
|
(t
|
|
;; In this case, no need to use
|
|
;; `scan-sexps', we can use some
|
|
;; `electric-pair--syntax-ppss' in this
|
|
;; case (which uses the quicker
|
|
;; `syntax-ppss' in some cases)
|
|
(let* ((ppss (electric-pair--syntax-ppss
|
|
(1- (point))))
|
|
(start (car (last (nth 9 ppss))))
|
|
(opener (char-after start)))
|
|
(and start
|
|
(eq (char-before pos)
|
|
(or (with-syntax-table table
|
|
(matching-paren opener))
|
|
opener))))))))
|
|
(actual-pair (if (> direction 0)
|
|
(char-before (point))
|
|
(char-after (point)))))
|
|
(unless innermost
|
|
(setq innermost (cons matched actual-pair)))
|
|
(unless matched
|
|
(setq outermost (cons matched actual-pair)))))))
|
|
(save-excursion
|
|
(while (not outermost)
|
|
(condition-case err
|
|
(electric-pair--with-uncached-syntax (table)
|
|
(scan-sexps (point) (if (> direction 0)
|
|
(point-max)
|
|
(- (point-max))))
|
|
(funcall at-top-level-or-equivalent-fn))
|
|
(scan-error
|
|
(cond ((or
|
|
;; some error happened and it is not of the "ended
|
|
;; prematurely" kind...
|
|
(not (string-match "ends prematurely" (nth 1 err)))
|
|
;; ... or we were in a comment and just came out of
|
|
;; it.
|
|
(and string-or-comment
|
|
(not (nth 8 (syntax-ppss)))))
|
|
(funcall at-top-level-or-equivalent-fn))
|
|
(t
|
|
;; exit the sexp
|
|
(goto-char (nth 3 err))
|
|
(funcall ended-prematurely-fn)))))))
|
|
(cons innermost outermost)))
|
|
|
|
(defvar electric-pair-string-bound-function 'point-max
|
|
"Next buffer position where strings are syntactically unexpected.
|
|
Value is a function called with no arguments and returning a
|
|
buffer position. Major modes should set this variable
|
|
buffer-locally if they experience slowness with
|
|
`electric-pair-mode' when pairing quotes.")
|
|
|
|
(defun electric-pair--unbalanced-strings-p (char)
|
|
"Return non-nil if there are unbalanced strings started by CHAR."
|
|
(let* ((selector-ppss (syntax-ppss))
|
|
(relevant-ppss (save-excursion
|
|
(if (nth 4 selector-ppss) ; comment
|
|
(electric-pair--syntax-ppss
|
|
(progn
|
|
(goto-char (nth 8 selector-ppss))
|
|
(forward-comment (point-max))
|
|
(skip-syntax-backward " >!")
|
|
(point)))
|
|
(syntax-ppss
|
|
(funcall electric-pair-string-bound-function)))))
|
|
(string-delim (nth 3 relevant-ppss)))
|
|
(or (eq t string-delim)
|
|
(eq char string-delim))))
|
|
|
|
(defun electric-pair--inside-string-p (char)
|
|
"Return non-nil if point is inside a string started by CHAR.
|
|
|
|
A comments text is parsed with `electric-pair-text-syntax-table'.
|
|
Also consider strings within comments, but not strings within
|
|
strings."
|
|
;; FIXME: could also consider strings within strings by examining
|
|
;; delimiters.
|
|
(let ((ppss (electric-pair--syntax-ppss (point) '(comment))))
|
|
(memq (nth 3 ppss) (list t char))))
|
|
|
|
(defmacro electric-pair--save-literal-point-excursion (&rest body)
|
|
;; FIXME: need this instead of `save-excursion' when functions in
|
|
;; BODY, such as `electric-pair-inhibit-if-helps-balance' and
|
|
;; `electric-pair-skip-if-helps-balance' modify and restore the
|
|
;; buffer in a way that modifies the marker used by save-excursion.
|
|
(let ((point (make-symbol "point")))
|
|
`(let ((,point (point)))
|
|
(unwind-protect (progn ,@body) (goto-char ,point)))))
|
|
|
|
(defun electric-pair-inhibit-if-helps-balance (char)
|
|
"Return non-nil if auto-pairing of CHAR would hurt parentheses' balance.
|
|
|
|
Works by first removing the character from the buffer, then doing
|
|
some list calculations, finally restoring the situation as if nothing
|
|
happened."
|
|
(pcase (electric-pair-syntax-info char)
|
|
(`(,syntax ,pair ,_ ,s-or-c)
|
|
(catch 'done
|
|
;; FIXME: modify+undo is *very* tricky business. We used to
|
|
;; use `delete-char' followed by `insert', but this changed the
|
|
;; position some markers. The real fix would be to compute the
|
|
;; result without having to modify the buffer at all.
|
|
(atomic-change-group
|
|
(delete-char -1)
|
|
(throw
|
|
'done
|
|
(cond ((eq ?\( syntax)
|
|
(let* ((pair-data
|
|
(electric-pair--balance-info 1 s-or-c))
|
|
(outermost (cdr pair-data)))
|
|
(cond ((car outermost)
|
|
nil)
|
|
(t
|
|
(eq (cdr outermost) pair)))))
|
|
((eq syntax ?\")
|
|
(electric-pair--unbalanced-strings-p char)))))))))
|
|
|
|
(defun electric-pair-skip-if-helps-balance (char)
|
|
"Return non-nil if skipping CHAR would benefit parentheses' balance.
|
|
Works by first removing the character from the buffer, then doing
|
|
some list calculations, finally restoring the situation as if nothing
|
|
happened."
|
|
(pcase (electric-pair-syntax-info char)
|
|
(`(,syntax ,pair ,_ ,s-or-c)
|
|
(unwind-protect
|
|
(progn
|
|
(delete-char -1)
|
|
(cond ((eq syntax ?\))
|
|
(let* ((pair-data
|
|
(electric-pair--balance-info
|
|
-1 s-or-c))
|
|
(innermost (car pair-data))
|
|
(outermost (cdr pair-data)))
|
|
(and
|
|
(cond ((car outermost)
|
|
(car innermost))
|
|
((car innermost)
|
|
(not (eq (cdr outermost) pair)))))))
|
|
((eq syntax ?\")
|
|
(electric-pair--inside-string-p char))))
|
|
(insert char)))))
|
|
|
|
(defun electric-pair-default-skip-self (char)
|
|
(if electric-pair-preserve-balance
|
|
(electric-pair-skip-if-helps-balance char)
|
|
t))
|
|
|
|
(defun electric-pair-default-inhibit (char)
|
|
(if electric-pair-preserve-balance
|
|
(electric-pair-inhibit-if-helps-balance char)
|
|
(electric-pair-conservative-inhibit char)))
|
|
|
|
(defun electric-pair-post-self-insert-function ()
|
|
(let* ((pos (and electric-pair-mode (electric--after-char-pos)))
|
|
(skip-whitespace-info))
|
|
(pcase (electric-pair-syntax-info last-command-event)
|
|
(`(,syntax ,pair ,unconditional ,_)
|
|
(cond
|
|
((null pos) nil)
|
|
;; Wrap a pair around the active region.
|
|
;;
|
|
((and (memq syntax '(?\( ?\) ?\" ?\$)) (use-region-p))
|
|
;; FIXME: To do this right, we'd need a post-self-insert-function
|
|
;; so we could add-function around it and insert the closer after
|
|
;; all the rest of the hook has run.
|
|
(if (or (eq syntax ?\")
|
|
(and (eq syntax ?\))
|
|
(>= (point) (mark)))
|
|
(and (not (eq syntax ?\)))
|
|
(>= (mark) (point))))
|
|
(save-excursion
|
|
(goto-char (mark))
|
|
(electric-pair--insert pair))
|
|
(delete-region pos (1- pos))
|
|
(electric-pair--insert pair)
|
|
(goto-char (mark))
|
|
(electric-pair--insert last-command-event)))
|
|
;; Backslash-escaped: no pairing, no skipping.
|
|
((save-excursion
|
|
(goto-char (1- pos))
|
|
(not (zerop (% (skip-syntax-backward "\\") 2))))
|
|
nil)
|
|
;; Skip self.
|
|
((and (memq syntax '(?\) ?\" ?\$))
|
|
(and (or unconditional
|
|
(if (functionp electric-pair-skip-self)
|
|
(electric-pair--save-literal-point-excursion
|
|
(goto-char pos)
|
|
(funcall electric-pair-skip-self last-command-event))
|
|
electric-pair-skip-self))
|
|
(save-excursion
|
|
(when (and (not (and unconditional
|
|
(eq syntax ?\")))
|
|
(setq skip-whitespace-info
|
|
(if (and (not (eq electric-pair-skip-whitespace 'chomp))
|
|
(functionp electric-pair-skip-whitespace))
|
|
(funcall electric-pair-skip-whitespace)
|
|
electric-pair-skip-whitespace)))
|
|
(funcall electric-pair-skip-whitespace-function))
|
|
(eq (char-after) last-command-event))))
|
|
;; This is too late: rather than insert&delete we'd want to only
|
|
;; skip (or insert in overwrite mode). The difference is in what
|
|
;; goes in the undo-log and in the intermediate state which might
|
|
;; be visible to other post-self-insert-hook. We'll just have to
|
|
;; live with it for now.
|
|
(when skip-whitespace-info
|
|
(funcall electric-pair-skip-whitespace-function))
|
|
(delete-region (1- pos) (if (eq skip-whitespace-info 'chomp)
|
|
(point)
|
|
pos))
|
|
(forward-char))
|
|
;; Insert matching pair.
|
|
((and (memq syntax '(?\( ?\" ?\$))
|
|
(not overwrite-mode)
|
|
(or unconditional
|
|
(not (electric-pair--save-literal-point-excursion
|
|
(goto-char pos)
|
|
(funcall electric-pair-inhibit-predicate
|
|
last-command-event)))))
|
|
(save-excursion (electric-pair--insert pair)))))
|
|
(_
|
|
(when (and (if (functionp electric-pair-open-newline-between-pairs)
|
|
(funcall electric-pair-open-newline-between-pairs)
|
|
electric-pair-open-newline-between-pairs)
|
|
(eq last-command-event ?\n)
|
|
(< (1+ (point-min)) (point) (point-max))
|
|
(eq (save-excursion
|
|
(skip-chars-backward "\t\s")
|
|
(char-before (1- (point))))
|
|
(matching-paren (char-after))))
|
|
(save-excursion (newline 1 t)))))))
|
|
|
|
(defun electric-pair-will-use-region ()
|
|
(and (use-region-p)
|
|
(memq (car (electric-pair-syntax-info last-command-event))
|
|
'(?\( ?\) ?\" ?\$))))
|
|
|
|
(defun electric-pair-delete-pair (arg &optional killp)
|
|
"When between adjacent paired delimiters, delete both of them.
|
|
ARG and KILLP are passed directly to
|
|
`backward-delete-char-untabify', which see."
|
|
(interactive "*p\nP")
|
|
(delete-char 1)
|
|
(backward-delete-char-untabify arg killp))
|
|
|
|
(defvar electric-pair-mode-map
|
|
(let ((map (make-sparse-keymap)))
|
|
(define-key map "\177"
|
|
`(menu-item
|
|
"" electric-pair-delete-pair
|
|
:filter
|
|
,(lambda (cmd)
|
|
(let* ((prev (char-before))
|
|
(next (char-after))
|
|
(syntax-info (and prev
|
|
(electric-pair-syntax-info prev)))
|
|
(syntax (car syntax-info))
|
|
(pair (cadr syntax-info)))
|
|
(and next pair
|
|
(memq syntax '(?\( ?\" ?\$))
|
|
(eq pair next)
|
|
(if (functionp electric-pair-delete-adjacent-pairs)
|
|
(funcall electric-pair-delete-adjacent-pairs)
|
|
electric-pair-delete-adjacent-pairs)
|
|
cmd)))))
|
|
map)
|
|
"Keymap used by `electric-pair-mode'.")
|
|
|
|
;;;###autoload
|
|
(define-minor-mode electric-pair-mode
|
|
"Toggle automatic parens pairing (Electric Pair mode).
|
|
|
|
Electric Pair mode is a global minor mode. When enabled, typing
|
|
an open parenthesis automatically inserts the corresponding
|
|
closing parenthesis, and vice versa. (Likewise for brackets, etc.).
|
|
If the region is active, the parentheses (brackets, etc.) are
|
|
inserted around the region instead.
|
|
|
|
To toggle the mode in a single buffer, use `electric-pair-local-mode'."
|
|
:global t :group 'electricity
|
|
(if electric-pair-mode
|
|
(progn
|
|
(add-hook 'post-self-insert-hook
|
|
#'electric-pair-post-self-insert-function
|
|
;; Prioritize this to kick in after
|
|
;; `electric-layout-post-self-insert-function': that
|
|
;; considerably simplifies interoperation when
|
|
;; `electric-pair-mode', `electric-layout-mode' and
|
|
;; `electric-indent-mode' are used together.
|
|
;; Use `vc-region-history' on these lines for more info.
|
|
50)
|
|
(add-hook 'self-insert-uses-region-functions
|
|
#'electric-pair-will-use-region))
|
|
(remove-hook 'post-self-insert-hook
|
|
#'electric-pair-post-self-insert-function)
|
|
(remove-hook 'self-insert-uses-region-functions
|
|
#'electric-pair-will-use-region)))
|
|
|
|
;;;###autoload
|
|
(define-minor-mode electric-pair-local-mode
|
|
"Toggle `electric-pair-mode' only in this buffer."
|
|
:variable (buffer-local-value 'electric-pair-mode (current-buffer))
|
|
(cond
|
|
((eq electric-pair-mode (default-value 'electric-pair-mode))
|
|
(kill-local-variable 'electric-pair-mode))
|
|
((not (default-value 'electric-pair-mode))
|
|
;; Locally enabled, but globally disabled.
|
|
(electric-pair-mode 1) ; Setup the hooks.
|
|
(setq-default electric-pair-mode nil) ; But keep it globally disabled.
|
|
)))
|
|
|
|
(provide 'elec-pair)
|
|
|
|
;;; elec-pair.el ends here
|