Skip to content

feat(fontlock): fontify the variable and type in typeguard #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josteink merged 2 commits into from
Jul 3, 2022
Merged

feat(fontlock): fontify the variable and type in typeguard #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d223ae4
style: fix whitespace
Fuco1 Jun 30, 2022
333a7c5
feat(fontlock): fontify the variable and type in typeguard
Fuco1 Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions typescript-mode-general-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,19 @@ function foo<Z, Y, Z & Y, Z | Y | Z, Y<X<X, Y>>>()\n"
"type Thing = number;"
(should (eq (get-face-at "Thing") 'font-lock-type-face))))

(ert-deftest font-lock/fontify-type-guard ()
"The type guard syntax

var is Type

should be fontified as variable, keyword and type."
(test-with-fontified-buffer
"function test(var: unknown): var is RetType {\n}"
(should (eq (get-face-at 30) 'font-lock-variable-name-face))
(should (eq (get-face-at "is") 'font-lock-keyword-face))
(should (eq (get-face-at "RetType") 'font-lock-type-face))))


(ert-deftest font-lock/type-names-level4 ()
"Typenames should be highlighted in declarations"

Expand Down
41 changes: 22 additions & 19 deletions typescript-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,10 +2013,13 @@ This performs fontification according to `typescript--class-styles'."
;; - private generic: SomeType<Foo>
;; - private genericArray: SomeType<Foo>[]
;; - function testFunc(): SomeType<> {
;; - function testFunc(a): a is SomeType<> {
;; TODO: namespaced classes!
,(list
(concat ":\\s-\\(" typescript--type-name-re "\\)\\(<" typescript--type-name-re ">\\)?\\(\[\]\\)?\\([,;]\\)?\\s-*{?")
'(1 'font-lock-type-face))
(concat ":\\s-\\(?:\\s-*\\(" typescript--name-re "\\)\\s-*\\(is\\)\\s-*\\)?" "\\(" typescript--type-name-re "\\)\\(<" typescript--type-name-re ">\\)?\\(\[\]\\)?\\([,;]\\)?\\s-*{?")
'(1 'font-lock-variable-name-face nil t)
'(2 'font-lock-keyword-face nil t)
'(3 'font-lock-type-face))

;; type-casts
,(list
Expand Down Expand Up @@ -2094,7 +2097,7 @@ This performs fontification according to `typescript--class-styles'."
;; but need care to avoid affecting the // and */ comment markers.
("\\(?:^\\|[=([{,:;|&!]\\|\\_<return\\_>\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
(1 (ignore
(forward-char -1)
(forward-char -1)
(when (or (not (memq (char-after (match-beginning 0)) '(?\s ?\t)))
;; If the / is at the beginning of line, we have to check
;; the end of the previous text.
Expand Down Expand Up @@ -2330,20 +2333,20 @@ the same column as the current line."
(save-excursion
(save-match-data
(when (looking-at "\\s-*\\_<while\\_>")
(if (save-excursion
(skip-chars-backward "[ \t\n]*}")
(looking-at "[ \t\n]*}"))
(save-excursion
(backward-list) (forward-symbol -1) (looking-at "\\_<do\\_>"))
(typescript--re-search-backward "\\_<do\\_>" (point-at-bol) t)
(or (looking-at "\\_<do\\_>")
(let ((saved-indent (current-indentation)))
(while (and (typescript--re-search-backward "^\\s-*\\_<" nil t)
(/= (current-indentation) saved-indent)))
(and (looking-at "\\s-*\\_<do\\_>")
(not (typescript--re-search-forward
"\\_<while\\_>" (point-at-eol) t))
(= (current-indentation) saved-indent)))))))))
(if (save-excursion
(skip-chars-backward "[ \t\n]*}")
(looking-at "[ \t\n]*}"))
(save-excursion
(backward-list) (forward-symbol -1) (looking-at "\\_<do\\_>"))
(typescript--re-search-backward "\\_<do\\_>" (point-at-bol) t)
(or (looking-at "\\_<do\\_>")
(let ((saved-indent (current-indentation)))
(while (and (typescript--re-search-backward "^\\s-*\\_<" nil t)
(/= (current-indentation) saved-indent)))
(and (looking-at "\\s-*\\_<do\\_>")
(not (typescript--re-search-forward
"\\_<while\\_>" (point-at-eol) t))
(= (current-indentation) saved-indent)))))))))


(defun typescript--ctrl-statement-indentation ()
Expand Down Expand Up @@ -2952,9 +2955,9 @@ Key bindings:
comment-start-skip "\\(//+\\|/\\*+\\)\\s *")

(setq-local electric-indent-chars
(append "{}():;," electric-indent-chars))
(append "{}():;," electric-indent-chars))
(setq-local electric-layout-rules
'((?\; . after) (?\{ . after) (?\} . before)))
'((?\; . after) (?\{ . after) (?\} . before)))

(let ((c-buffer-is-cc-mode t))
;; FIXME: These are normally set by `c-basic-common-init'. Should
Expand Down