branch: externals/matlab-mode commit 578bf4121af0051a3a121837c76879d662120942 Author: John Ciolfi <john.ciolfi...@gmail.com> Commit: John Ciolfi <john.ciolfi...@gmail.com>
matlab-ts-mode: add matlab-function-signature-face --- matlab-ts-mode.el | 8 ++++++++ .../font_lock_class_issue55_abstract.m | 4 ++-- .../font_lock_class_issue55_abstract_expected.txt | 4 ++-- .../font_lock_class_issue55_subclass.m | 4 ++-- .../font_lock_class_issue55_subclass_expected.txt | 4 ++-- tests/test-matlab-ts-mode-font-lock.el | 1 + 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/matlab-ts-mode.el b/matlab-ts-mode.el index a669cc9ac3..b76a3fe5b9 100644 --- a/matlab-ts-mode.el +++ b/matlab-ts-mode.el @@ -117,6 +117,12 @@ Guidelines: :slant italic)) "*Face used for \"end\" when used as an array or cell dimension number index.") +(defface matlab-function-signature-face + '((t :inherit font-lock-type-face + :weight bold + :slant italic)) + "*Face used for classdef abstract method function signature declarations.") + (defcustom matlab-ts-mode-font-lock-level 3 "*Level of font lock for MATLAB code. The \"Standard\" level plus either MLint flycheck or the MATLAB Language @@ -695,6 +701,8 @@ than the FILED-EXPRESSION-NODE start-point and end-point." :language 'matlab :feature 'definition '( + ;; See: tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract.m + (function_signature name: (identifier) @matlab-function-signature-face) ;; See: tests/test-matlab-ts-mode-font-lock-files/font_lock_fcn_small_no_args.m (function_definition name: (identifier) @font-lock-function-name-face) ;; See: tests/test-matlab-ts-mode-font-lock-files/font_lock_symPosDef.m diff --git a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract.m b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract.m index f3471f222c..c4bd9f2ded 100644 --- a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract.m +++ b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract.m @@ -8,7 +8,7 @@ classdef font_lock_class_issue55_abstract end methods(Abstract) - a = f(obj); - b = g(obj); + a = foo(obj); + b = goo(obj); end end diff --git a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract_expected.txt b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract_expected.txt index e2711fc1c6..973c6af076 100644 --- a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract_expected.txt +++ b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_abstract_expected.txt @@ -8,7 +8,7 @@ kkkkkkkk ffffffffffffffffffffffffffffffff kkk kkkkkkkbttttttttb - v o dbvvvbD - v o dbvvvbD + v o gggbvvvbD + v o gggbvvvbD kkk kkk diff --git a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass.m b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass.m index f59bb60271..67667b1be9 100644 --- a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass.m +++ b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass.m @@ -8,11 +8,11 @@ classdef font_lock_class_issue55_subclass < font_lock_class_issue55_abstract end methods - function a = f(obj) + function a = foo(obj) a = obj.p1 + 10; end - function b = g(obj) + function b = goo(obj) b = obj.p1 + 20; end end diff --git a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass_expected.txt b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass_expected.txt index 4d8c866dea..6d1f79f617 100644 --- a/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass_expected.txt +++ b/tests/test-matlab-ts-mode-font-lock-files/font_lock_class_issue55_subclass_expected.txt @@ -8,11 +8,11 @@ kkkkkkkk ffffffffffffffffffffffffffffffff o ffffffffffffffffffffffffffffffff kkk kkkkkkk - kkkkkkkk v o fbvvvb + kkkkkkkk v o fffbvvvb v o dddDdd o nnD kkk - kkkkkkkk v o fbvvvb + kkkkkkkk v o fffbvvvb v o dddDdd o nnD kkk kkk diff --git a/tests/test-matlab-ts-mode-font-lock.el b/tests/test-matlab-ts-mode-font-lock.el index 0fe9a99b8f..143d4a8e53 100644 --- a/tests/test-matlab-ts-mode-font-lock.el +++ b/tests/test-matlab-ts-mode-font-lock.el @@ -73,6 +73,7 @@ after validating it, rename it to ("E" . font-lock-escape-face) ("F" . font-lock-function-call-face) ("f" . font-lock-function-name-face) + ("g" . matlab-function-signature-face) ("h" . font-lock-doc-face) ;; function doc help comment ("H" . matlab-ts-mode-comment-heading-face) ("k" . font-lock-keyword-face)