Given:
function foo()
bar()
end
function bar()
goo()
end
function goo()
keyboard
end
In matlab-shell, the first stack entry is now hyperlinked:
>> foo
K>> dbstack
> In foo>goo (line 10)
In foo>bar (line 6)
In foo (line 2)
K>>
Also fixed a couple typos.
Prior commit to support electric-pair-mode is good, but had warnings when byte-compiling matlab.el.
This commit removes that warning by adding (eval-when-compile (require 'elec-pair)).
In matlab-last-script-type-guess, handle case of exporting an org-mode '#+begin_src matlab' code
block. In this case org-mode will create a temporary buffer in matlab-mode, which means
matlab-last-script-type-guess will see an empty buffer, then org-mode will insert the content. To
ensure keywords such as enumeration are syntactically recognized, we set the type to 'class which
covers all matlab language keywords. This works for both classdef's and non-classdef's.
This commit also fixes a hang in matlab-mode (see fontlockhang branch)
Also indented matlab.el and fixed typos
Fix conflict between matlab-shell debugging and C++ (or other language) debugging.
- matlab-shell debugging previously leveraged gud.el for debugging of *.m files.
- C++ debugging also leverages gud.el for debugging.
- Only one instance of a gud.el debugger can be active. If you run two, say
*.m debugging and C++ debugging. Then you get odd errors such as the
ebbreak not being recognized by gdb.
To fix these issue, I copied gud.el and made a new namespace "mlgud". I also
removed a lot of unused code from mlgud.el, though there's still more that can
be removed. Now one can debug *.m files and *.cpp files in one Emacs session.
* matlab-shell.el (matlab-shell-region->script): 676 apply patch provided by Karthik Chikmagalur <karthikchikmagalur@gmail.com>: Copy all local functions to script.
(matlab-mode-menu, matlab-mode): Remove reference to `matlab-indent-sexp' which was deleted.
(matlab-function-font-lock-keywords, matlab-calculate-indentation):
Improve regex for detecting end of 1st argument for functions that treat the
first argument special.
(matlab-mode) Change default value for `add-log-current-defun-function'
to be `matlab-add-log-current-defun'.
(matlab-current-cell): New
(matlab-add-log-current-defun): New. Use `matlab-current-defun' or above.
matlab-syntax.el:
(matlab-syntax-setup): Remove extra setting of page-delimiter.
(mlint-error-id-fix-alist):
Add MCSCC for bad constructor name to be auto fixable.
(mlint-lm-function-name::initialize-instance):
Add matcher for MCSCC warnings.
(matlab-hg-primitives-list): Fix typo of a command name.
(matlab-comment-on-line): Fix this fcn to do what the doc says.
mlint.el:
(mlint-mark-ok): Separate the 2 cases of existing comment or not and
do each with special code. Make sure the OK is put in the right
place.
(matlab--valid-arguments-keyword-point):
If previous code is 'end', make sure it matches a valid arguments block.
(matlab-re-search-keyword-forward,matlab-re-search-keyword-backward):
When checking if in string/comment, don't pass in 'all comments' as t.
Do that only if in a comment.
matlab-syntax.el:
(matlab-beginning-of-string-or-comment):
Make doc accurate.
(matlab-end-of-string-or-comment):
Fix logic for case when not in a comment to only skip all comments if
looking at a comment. Avoid moving pt if just looking at whitespace.
matlab.el:
(matlab-do-functions-have-end-p):
Improve scanning for end to not do condition-case.
This was hiding an error that was causing incorrect answer.
(matlab-beginning-of-string-or-comment):
If 'all-comments' is passed in, always skip those comments even if
not in a comment right now.
(matlab-end-of-string-or-comment):
If 'all-comments' is passed in, always skip those comments even if not
in a comment right now.
Make a defun, not defsubst since it is getting pretty big.
matlab.el:
(matlab-mode-menu): Remove navigate menu. No special navigation anymore.
(matlab-mode): Setup beginning-of-defun-function and end-of-defun-function.
(matlab-beginning-of-defun, matlab-end-of-defun):
Update to have input arg like built-in version.
Be more robust about skipping over comments between defuns.
(matlab-beginning-of-defun-raw): New - from above.
(matlab-skip-over-defun): New.
(matlab-current-defun): Use raw version.
(matlab-show-line-info): Fix bug.
Also print name of current defun.
(matlab-move-simple-sexp-backward-internal,matlab-move-simple-sexp-internal):
Set `forward-sexp-function' to nil so the next call doesn't route to
`matlab-forward-sexp' by accident.
matlab.el:
Disable custom stuff related to navigating sexp, and instead depend on `forward-sexp-function'
to enable built-in Emacs behavior in all cases, not just the special ones we added.
(matlab-mode-map): Remove all bindings that do navigation.
(matlab-mode): Remove comments about custom nav commands.
Set `forward-sexp-function' to `matlab-forward-sexp-function'.
(matlab-forward-sexp-fcn): NEW
(matlab-backward-sexp, matlab-forward-sexp): Remove interactive key.
(matlab-block-comment-start-re, matlab-block-comment-end-re)
(matlab-ltype-block-comment-start, matlab-ltype-block-comment-end)
(matlab-block-comment-bounds):
DELETED - no longer used.
matlab.el:
(matlab-mode-map): Re-arrange the map.
Delete bindings for return and c-j (use default)
Add comments and build sections.
(matlab-mode): Update comments.
Add electric-indent-functions setting.
Remove matlab-comment-indent as a setting (use nil)
(matlab-return-function, matlab-return, matlab-plain-ret)
(matlab-indent-after-ret, matlab-indent-end-before-ret)
(matlab-semicolon-on-return, matlab-indent-before-ret)
(matlab-linefeed):
DELETED - use default 'newline' and electric indents instead.
(matlab-electric-indent-function):
NEW - auto-reindent when finishing typing end,
else, case, and a few other things.
(matlab-electric-comment):
Re-write to use new APIs from matlab-scan.el.
This enabled deletion of block comment stuff from matlab-syntax.el.
(matlab-comment-line-break-function):
Remove use of 'matlab-indent-line'.
(matlab-comment-indent): Delete (see change in matlab-mode)
tests/metest.el:
Stop using `matlab-block-comment-bounds'. Replace with new API call.
(matlab-font-lock-anchor-variable-match): . is ok in arguments variable names.
tests/blocks.m:
Added sample argument block using variable name as struct with . in it.
(matlab--valid-arguments-keyword-point):
Argument keywords are ok after an 'end' as well - assuming the 'end' is
another argument block - but we don't check that part, just hope for the best.
tests/blocks.m:
Add example with two argument blocks in a row.
(matlab-calculate-indentation):
Optimize calling `matlab--previous-line-indent-recommendation' only
once in case of checking indentation level less than max indent.
(matlab-indent-function-body, matlab-functions-have-end):
Make safe local variable (needed in tests.)
(matlab-line-count-open-blocks, matlab-line-count-closed-blocks):
DELETE - replaced by ...
(matlab-line-count-block-change): New.
Return + or - num based on num of opened or closed blocks that
don't cancel eachother out. Cuts keyword search on line in half.
(matlab-next-line-indentation): Use `matlab-line-count-block-change'
replacing old calls.
Simplify how functions w/ no indent works.
Simplify indent based on indenting block starts and ends.
Simplify number of local variables.
tests/metest.el:
Add new test file for detect and indent.
tests/mfuncnofuncindent.m:
New file with functions with ends but no indent.
Setting w/ local variable.
Verify this mode works.
(matlab--previous-line-indent-recommendation):
If scanning backwards finds empty line @ beginning of buffer,
then just return 0.
tests/indents.m:
Add blank first line to exercise above.
(matlab-indent-past-arg1-functions): Wrap expression
to only be whole-symbols.
(matlab-function-font-lock-keywords): Accomodate change
to above.
tests/indents.el:
Add test that used to indent as if it were a fcn that
indents past arg1, but shouldn't.
(matlab-fl-opt-continuation, matlab-fl-opt-whitespace)
(matlab-fl-fcn-key, matlab-fl-return-args)
(matlab-fl-fcn-name, matlab-fl-fcn-args):
New regex parts for building font lock keywords.
(matlab-function-font-lock-keywords):
Revamp using above keyword parts.
Now handles continuations between different parts of
the function declaration.
tests/fontlock.m:
New tests for various function declaration flavors with
and without ellipsis between differentparts.
(matlab-scan-comment-help-p): After finding prev code line,
move to beginning of that command before detecting the declaration.
(matlab-scan-beginning-of-command): Add a code-only
input to skip comment scanning.
tests/continuations.m:
Add tests with continuations in function declarations to better
test new fcn comment scanning.
(matlab-indent-region, matlab-indent-line):
Remove use of matlab-navigation-syntax.
I don't think we need this anymore - and it messes
up optimzations w/ syntax-ppss anyway.
(matlab-next-line-indentation):
When checking for block-middle or block-case, pass
in the correct lvl1 context for analysis.
Fixes bug w/ indentaion after a middle or case that
has a continuation.
tests/continuations.m:
Add new test cases for elsif and case with continuation.
(matlab-scan-previous-line-ellipsis-p):
Use `parse-partial-sexp' instead of `syntax-ppss' b/c
for ellipsis, we only need to check from bol, and parens
and comments can be ignored.
matlab.el:
(matlab-line-count-open-blocks, matlab-line-count-closed-blocks):
Update to accept 2 lvl1 context for the start and end of the block searches.
Use these to bound the search, and avoid creating more contexts, and avoid
calling `matlab-scan-beginning-of-command'.
(matlab-next-line-indentation):
Be careful about calls that require syntax to propertize the buffer.
Starting with input lvl1, capture lvl1 ctxt for beginning of command
and use that for remaining calls. This makes it more explicity about
what is being checked where, and faster.
(matlab-compute-line-context-lvl-1):
Optimize use of `syntax-ppss'. See big comment for details on how it works.
matlab.el:
(matlab-functions-have-end-minor-mode):
Re-enable command-line-dual checking in classes.
(matlab-functions-have-end-minor-mode):
When activating this mode for classes, now disable command-dual support.
Speeds up indenting very large classes.
(matlab-calculate-indentation):
For continued from previous non-continued line, no arrays:
Include indent recommendation from the previous line to account for
indentation under ctrl blocks.
(matlab-next-line-indentation):
While computing startpt, be sure to move pt to the line that was
passed in.
(matlab-calculate-indentation):
Break continuations into 2 bins: Those from parens, and those not.
Isolate non-paren version to avoid calling 'beginning-of-command'.
Instead just look at previous line, and decide if we need to do a
continuation indent or not, otherwise just follow the previous line.
(matlab-shell-font-lock-keywords, matlab-shell-object-output-font-lock-keywords):
Move a few extra things out of base keywords and into next level keywords.
(mlint-lm-replace-focus::initialize-instance)
(mlint-lm-function-name::initialize-instance)
(mlint-lm-entry-deprecated::initialize-instance):
Quote in the class name when passed to oref-default to silence warning.
semanticdb-matlab.el:
(semanticdb-project-system-databases)
(semanticdb-project-database-matlab::semanticdb-get-database-tables)
Use 'make-instance' to create instances of classes.