Skip to content

Commit

Permalink
[Fix #713] Support insertion of emoticons in strict mode in text-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Fuco1 committed Jul 16, 2017
1 parent c83188b commit 8987c40
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 0 deletions.
65 changes: 65 additions & 0 deletions smartparens-text.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
;;; smartparens-latex.el --- Additional configuration for text-mode.

;; Copyright (C) 2017 Matus Goljer

;; Author: Matus Goljer <[email protected]>
;; Maintainer: Matus Goljer <[email protected]>
;; Created: 16 July 2017
;; Keywords: abbrev convenience editing
;; URL: https://github.com/Fuco1/smartparens

;; This file is not part of GNU Emacs.

;;; License:

;; This file is part of Smartparens.

;; Smartparens 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.

;; Smartparens 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 Smartparens. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:

;; This file provides some additional configuration for `text-mode'.
;; To use it, simply add:
;;
;; (require 'smartparens-text)
;;
;; into your configuration. You can use this in conjunction with the
;; default config or your own configuration.

;; If you have good ideas about what should be added please file an
;; issue on the github tracker.

;; For more info, see github readme at
;; https://github.com/Fuco1/smartparens

;;; Code:

(require 'smartparens)

(defun sp-text-mode-emoticon-p (_id action _context)
(when (memq action '(insert navigate))
(sp--looking-back-p ":-?[()]" 3)))

(defun sp-text-mode-skip-emoticon (ms mb me)
(when (member ms '("(" ")"))
(save-excursion
(goto-char mb)
(sp--looking-back-p ":-?" 2))))

(sp-local-pair 'text-mode "(" nil
:unless '(:add sp-text-mode-emoticon-p)
:skip-match 'sp-text-mode-skip-emoticon)

(provide 'smartparens-text)
;;; smartparens-text.el ends here
57 changes: 57 additions & 0 deletions test/smartparens-text-test.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
(require 'smartparens-text)
(require 'message)

(ert-deftest sp-test-text-mode-insert-emoticon-smiley-strict-mode ()
"#713"
(sp-test-with-temp-buffer "|"
(message-mode)
(smartparens-strict-mode 1)
(execute-kbd-macro ":)")
(sp-buffer-equals ":)")))

(ert-deftest sp-test-text-mode-insert-emoticon-smiley-with-nose-strict-mode ()
"#713"
(sp-test-with-temp-buffer "|"
(message-mode)
(smartparens-strict-mode 1)
(execute-kbd-macro ":-)")
(sp-buffer-equals ":-)")))

(ert-deftest sp-test-text-mode-insert-emoticon-frowny-strict-mode ()
"#713"
(sp-test-with-temp-buffer "|"
(message-mode)
(smartparens-strict-mode 1)
(execute-kbd-macro ":(")
(sp-buffer-equals ":(")))

(ert-deftest sp-test-text-mode-insert-emoticon-frowny-with-nose-strict-mode ()
"#713"
(sp-test-with-temp-buffer "|"
(message-mode)
(smartparens-strict-mode 1)
(execute-kbd-macro ":-(")
(sp-buffer-equals ":-(")))

(ert-deftest sp-test-text-mode-skip-emoticon-when-navigating ()
"#713"
(sp-test-with-temp-buffer "|(foo :) bar :( baz)"
(message-mode)
(sp-forward-sexp)
(sp-buffer-equals "(foo :) bar :( baz)|")))

(ert-deftest sp-test-text-mode-wrap-emoticons-strict-mode ()
"#713"
(sp-test-with-temp-buffer "| foo :) bar :( baz M"
(message-mode)
(smartparens-strict-mode 1)
(execute-kbd-macro "(")
(sp-buffer-equals "(| foo :) bar :( baz M)")))

(ert-deftest sp-test-text-mode-kill-region-with-emoticons-strict-mode ()
"#713"
(sp-test-with-temp-buffer "foo | foo :) bar :( baz M"
(message-mode)
(smartparens-strict-mode 1)
(call-interactively 'sp-kill-region)
(sp-buffer-equals "foo |")))

0 comments on commit 8987c40

Please sign in to comment.