Merge pull request #396 from vspinu/prefix

Fix prefix syntaxes

Author: bbatsov

CHANGELOG.md

@@ -3,7 +3,8 @@
 ## master (unreleased)
 
 ### Bugs fixed
-
+* [#394](https://github.com/clojure-emacs/clojure-mode/issues/394): `?` character is now treated as prefix when outside symbols.
+* [#394](https://github.com/clojure-emacs/clojure-mode/issues/394): `#` character now has prefix syntax class.
 * Fixed indentation of `definterface` to match that of `defprotocol`.
 * [#389](https://github.com/clojure-emacs/clojure-mode/issues/389): Fixed the indentation of `defrecord` and `deftype` multiple airity protocol forms.
 

clojure-mode.el

@@ -254,15 +254,15 @@ Out-of-the box clojure-mode understands lein, boot and gradle."
 
 (defvar clojure-mode-syntax-table
   (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
-    (modify-syntax-entry ?~ "'   " table)
     (modify-syntax-entry ?\{ "(}" table)
     (modify-syntax-entry ?\} "){" table)
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?? "_ p" table) ; prefix outside of symbols
+    (modify-syntax-entry ?~ "'" table)
     (modify-syntax-entry ?^ "'" table)
     (modify-syntax-entry ?@ "'" table)
-    ;; Make hash a usual word character
-    (modify-syntax-entry ?# "_ p" table)
+    (modify-syntax-entry ?# "'" table)
     table)
   "Syntax table for Clojure mode.
 Inherits from `emacs-lisp-mode-syntax-table'.")

test/clojure-mode-indentation-test.el

@@ -602,40 +602,6 @@ x
     (insert "{:a 2, ,:c 4}")
     (call-interactively #'clojure-align)
     (should (string= (buffer-string) "{:a 2, :c 4}"))))
-
-;;; Misc
-
-(defun non-func (form-a form-b)
-  (with-temp-buffer
-    (clojure-mode)
-    (insert form-a)
-    (save-excursion (insert form-b))
-    (clojure--not-function-form-p)))
-
-(ert-deftest non-function-form ()
-  (dolist (form '(("#?@ " "(c d)")
-                  ("#?@" "(c d)")
-                  ("#? " "(c d)")
-                  ("#?" "(c d)")
-                  ("" "[asda]")
-                  ("" "{a b}")
-                  ("#" "{a b}")
-                  ("" "(~)")))
-    (should (apply #'non-func form)))
-  (dolist (form '("(c d)"
-                  "(.c d)"
-                  "(:c d)"
-                  "(c/a d)"
-                  "(.c/a d)"
-                  "(:c/a d)"
-                  "(c/a)"
-                  "(:c/a)"
-                  "(.c/a)"))
-    (should-not (non-func "" form))
-    (should-not (non-func "^hint" form))
-    (should-not (non-func "#macro" form))
-    (should-not (non-func "^hint " form))
-    (should-not (non-func "#macro " form))))
 
 (provide 'clojure-mode-indentation-test)
 

test/clojure-mode-syntax-test.el

@@ -0,0 +1,80 @@
+;;; clojure-mode-syntax-test.el --- Clojure Mode: syntax related tests  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015-2016 Bozhidar Batsov <[email protected]>
+
+;; This file is not part of GNU Emacs.
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; The unit test suite of Clojure Mode
+
+;;; Code:
+
+(require 'clojure-mode)
+(require 'ert)
+
+(defun non-func (form-a form-b)
+  (with-temp-buffer
+    (clojure-mode)
+    (insert form-a)
+    (save-excursion (insert form-b))
+    (clojure--not-function-form-p)))
+
+(ert-deftest non-function-form ()
+  (dolist (form '(("#?@ " "(c d)")
+                  ("#?@" "(c d)")
+                  ("#? " "(c d)")
+                  ("#?" "(c d)")
+                  ("" "[asda]")
+                  ("" "{a b}")
+                  ("#" "{a b}")
+                  ("" "(~)")))
+    (should (apply #'non-func form)))
+  (dolist (form '("(c d)"
+                  "(.c d)"
+                  "(:c d)"
+                  "(c/a d)"
+                  "(.c/a d)"
+                  "(:c/a d)"
+                  "(c/a)"
+                  "(:c/a)"
+                  "(.c/a)"))
+    (should-not (non-func "" form))
+    (should-not (non-func "^hint" form))
+    (should-not (non-func "#macro" form))
+    (should-not (non-func "^hint " form))
+    (should-not (non-func "#macro " form))))
+
+(ert-deftest clojure-syntax-prefixed-symbols ()
+  (dolist (form '(("#?@aaa" . "aaa")
+                  ("#?aaa"  . "?aaa")
+                  ("#aaa"   . "aaa")
+                  ("'aaa"   . "aaa")))
+    (with-temp-buffer
+      (clojure-mode)
+      (insert (car form))
+      (equal (symbol-name (symbol-at-point)) (cdr form)))))
+
+(ert-deftest clojure-syntax-skip-prefixes ()
+  (dolist (form '("#?@aaa" "#?aaa" "#aaa" "'aaa"))
+    (with-temp-buffer
+      (clojure-mode)
+      (insert form)
+      (backward-word)
+      (backward-prefix-chars)
+      (should (bobp)))))
+
+(provide 'clojure-mode-syntax-test)