Skip to content

Commit

Permalink
more logging code. support javascript statement without semicolons
Browse files Browse the repository at this point in the history
  • Loading branch information
Chen Bin committed Jun 24, 2023
1 parent 3b12ed5 commit 41a062b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
15 changes: 12 additions & 3 deletions evil-matchit-javascript.el
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
;; should try next howto, the purpose is avoid missing any howto
(defvar evilmi-javascript-extract-keyword-howtos
'(("const .* *= *\\(styled\\)[^`]*` *$" 1) ; styled component
("^[ \t]*\\(`\\); *$" 1)))
("^[ \t]*\\(`\\);? *$" 1)))

(defvar evilmi-javascript-match-tags
'((("styled") () "`")))
Expand Down Expand Up @@ -67,24 +67,33 @@
(defun evilmi-javascript-get-tag ()
"Get tag at point."
;; only handle open tag
(when evilmi-debug
(message "evilmi-javascript-get-tag called"))
(let* (rlt)
(cond
;; bracket
((memq (following-char)
evilmi-javascript-matching-chars)
(when evilmi-debug
(message "evilmi-javascript-get-tag. following char=%s is in `evilmi-javascript-matching-chars'"
(following-char)))
(setq rlt (list (point))))

;; use defined tag
((setq rlt (evilmi-sdk-get-tag evilmi-javascript-match-tags
evilmi-javascript-extract-keyword-howtos))
;; do nothing
)

(when evilmi-debug
(message "evilmi-javascript-get-tag. current line has tag=%s in `evilmi-javascript-extract-keyword-howtos'"
rlt)))

;; other javascript statements containing brackets
(t
(let* ((r (evilmi--javascript-find-open-brace (evilmi-sdk-curline)))
(p (line-beginning-position)))
(when r
(when evilmi-debug
(message "evilmi-javascript-get-tag. open brace=%s" r))
(forward-line (1- (car r)))
(search-forward (cadr r) nil nil)
(backward-char)
Expand Down
12 changes: 5 additions & 7 deletions evil-matchit.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: Chen Bin <chenbin.sh@gmail.com>
;; URL: http://github.com/redguardtoo/evil-matchit
;; Version: 3.0.0
;; Version: 3.0.1
;; Keywords: matchit vim evil
;; Package-Requires: ((emacs "25.1"))
;;
Expand Down Expand Up @@ -95,7 +95,7 @@ Some modes can be toggle on/off in the hook"
(defun evilmi-jump-items-internal (num &optional func)
"Jump between items NUM times and apply function FUNC."
(when evilmi-debug
(message "evilmi-jump-items-internal called => %s (point)=%d" num (point)))
(message "evilmi-jump-items-internal called => %s (point)=%d func=%s" num (point) func))
(let* ((jump-rules (plist-get evilmi-plugins major-mode))
rlt
jumped
Expand Down Expand Up @@ -123,7 +123,7 @@ Some modes can be toggle on/off in the hook"
(setq ideal-dest (funcall (nth 1 rule) rlt num))
;; jump only once if the jump is successful
(setq jumped t))
(when evilmi-debug
(when (and evilmi-debug rlt)
(message "rlt=%s rule=%s p=%s jumped=%s idea-dest=%s"
rlt
rule
Expand All @@ -137,9 +137,7 @@ Some modes can be toggle on/off in the hook"
(evilmi-sdk-simple-jump)
(setq ideal-dest (point)))

(if evilmi-debug (message "evilmi-jump-items-internal called. Return: %s" ideal-dest))

(run-hook-with-args 'evilmi-jump-hook nil)
(if evilmi-debug (message "evilmi-jump-items-internal returned: %s" ideal-dest))
ideal-dest))

;;;###autoload
Expand Down Expand Up @@ -327,7 +325,7 @@ If IS-INNER is t, the region is inner text object."
(defun evilmi-version()
"Print version."
(interactive)
(message "3.0.0"))
(message "3.0.1"))

;; initialize evilmi-plugins only once
(evilmi-init-plugins)
Expand Down
2 changes: 1 addition & 1 deletion pkg.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
name=evil-matchit
version=3.0.0
version=3.0.1
pkg=$name-$version
mkdir $pkg
cp README.org $pkg
Expand Down

0 comments on commit 41a062b

Please sign in to comment.