Added settings that the cursor to be positioned between first empty quotes. issue #9.

3 files changed, 45 insertions, 5 deletions

diff --git a/README.md b/README.md
index 55925a3..66d0788 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,20 @@ to auto-load on your sgml modes:
 
 And you can set default indent depth of HTML abbreviation.
 
-    (add-hook 'emmet-mode-hook (lambda () (setq emmet-indentation 2))) ;indent 2 spaces.
+    (add-hook 'emmet-mode-hook (lambda () (setq emmet-indentation 2))) ;; indent 2 spaces.
 
 Good to go: place point in a emmet snippet and press C-j to expand it (or
 alternatively, alias your preferred keystroke to M-x emmet-expand-line) and
 you'll transform your snippet into the appropriate tag structure.
 
+If you want the cursor to be positioned between first empty quotes after expanding.
+
+    (setq emmet-move-cursor-between-quotes t) ;; default nil
+
+If you don't want to move cursor after expanding itself.
+
+    (setq emmet-move-cursor-after-expanding nil) ;; default t
+
 ## HTML abbreviations
 
 #### Basic tags
diff --git a/emmet-mode.el b/emmet-mode.el
index fd9c6fa..673343e 100644
--- a/emmet-mode.el
+++ b/emmet-mode.el
@@ -3481,7 +3481,7 @@ See also `emmet-expand-line'."
         (when markup
           (delete-region (line-beginning-position) (overlay-end ovli))
           (emmet-insert-and-flash markup)
-          (when (= (elt markup 0) ?<)
+          (when (and emmet-move-cursor-after-expanding (= (elt markup 0) ?<))
             (let ((p (point)))
               (goto-char
                (+ (- p (length markup))
@@ -3497,7 +3497,11 @@ See also `emmet-expand-line'."
           (setq c (elt str i))
           (case c
             (?\" (if (not (= last-c ?\\))
-                     (setq instring (not instring))))
+                     (progn (setq instring (not instring))
+                            (when (and emmet-move-cursor-between-quotes
+                                       (not instring)
+                                       (= last-c ?\"))
+                              (return i)))))
             (?>  (if (not instring)
                      (if intag
                          (if (= last-c ?/) (return (1+ i))
@@ -3538,6 +3542,18 @@ expansion after insertion."
   :type '(number :tag "Seconds")
   :group 'emmet)
 
+(defcustom emmet-move-cursor-after-expanding t
+  "If non-nil the the cursor position is
+moved to before the first closing tag when the exp was expanded."
+  :type 'boolean
+  :group 'emmet)
+
+(defcustom emmet-move-cursor-between-quotes nil
+  "If emmet-move-cursor-after-expands is non-nil and this is non-nil then
+cursor position will be moved to after the first quote."
+  :type 'boolean
+  :group 'emmet)
+
 (defun emmet-insert-and-flash (markup)
   (emmet-remove-flash-ovl (current-buffer))
   (let ((here (point)))
diff --git a/src/mode-def.el b/src/mode-def.el
index 24ea9ff..35a820e 100644
--- a/src/mode-def.el
+++ b/src/mode-def.el
@@ -171,7 +171,7 @@ See also `emmet-expand-line'."
         (when markup
           (delete-region (line-beginning-position) (overlay-end ovli))
           (emmet-insert-and-flash markup)
-          (when (= (elt markup 0) ?<)
+          (when (and emmet-move-cursor-after-expanding (= (elt markup 0) ?<))
             (let ((p (point)))
               (goto-char
                (+ (- p (length markup))
@@ -187,7 +187,11 @@ See also `emmet-expand-line'."
           (setq c (elt str i))
           (case c
             (?\" (if (not (= last-c ?\\))
-                     (setq instring (not instring))))
+                     (progn (setq instring (not instring))
+                            (when (and emmet-move-cursor-between-quotes
+                                       (not instring)
+                                       (= last-c ?\"))
+                              (return i)))))
             (?>  (if (not instring)
                      (if intag
                          (if (= last-c ?/) (return (1+ i))
@@ -228,6 +232,18 @@ expansion after insertion."
   :type '(number :tag "Seconds")
   :group 'emmet)
 
+(defcustom emmet-move-cursor-after-expanding t
+  "If non-nil the the cursor position is
+moved to before the first closing tag when the exp was expanded."
+  :type 'boolean
+  :group 'emmet)
+
+(defcustom emmet-move-cursor-between-quotes nil
+  "If emmet-move-cursor-after-expands is non-nil and this is non-nil then
+cursor position will be moved to after the first quote."
+  :type 'boolean
+  :group 'emmet)
+
 (defun emmet-insert-and-flash (markup)
   (emmet-remove-flash-ovl (current-buffer))
   (let ((here (point)))