jflack/emacs-matlab
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

matlab-scan.el:

Browse source 
(matlab-line-declaration-name):
Fix finding name when there are coninuations around the return arguments.
This commit is contained in:
Eric Ludlam 2021-04-04 17:30:06 -04:00
parent 509796c079
commit 9f7a03e83f
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
matlab-scan.el
View file

@ -491,6 +491,7 @@ Return nil for empty and comment only lines."
)
;; Declarations and Names
(defvar matlab-fl-opt-whitespace)
(defun matlab-line-declaration-name (&optional lvl1)
"Return string name of a declaration on the line.
For functions, this is the name of the function.
@ -511,9 +512,15 @@ If the current line is not a declaration, return nil."
((string= (matlab-line-first-word-text lvl1) "function")
(forward-word 1)
(skip-syntax-forward " ")
(when (looking-at "\\(\\[[^]]+]\\|\\w+\\)\\s-*=")
(forward-comment 10)
(when (looking-at (concat
"\\(\\[[^]]+]\\|\\w+\\)"
matlab-fl-opt-whitespace
"="))
(goto-char (match-end 0))
(skip-syntax-forward " "))
(skip-syntax-forward " ")
(forward-comment 10)
)
(setq type 'function
start (point)
end (save-excursion
@ -524,9 +531,12 @@ If the current line is not a declaration, return nil."
((string= (matlab-line-first-word-text lvl1) "classdef")
(forward-word 1)
(skip-syntax-forward " ")
(forward-comment 10)
(when (looking-at "([^)]+)")
(goto-char (match-end 0))
(skip-syntax-forward " "))
(skip-syntax-forward " ")
(forward-comment 10)
)
(setq type 'classdef
start (point)
end (save-excursion