Skip to content

Fix broken attribute parsing in classdef. #88

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
merged 7 commits into from
Jul 19, 2024
Merged

Fix broken attribute parsing in classdef. #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d917df6
better classedf
apozharski Jul 17, 2024
1103d06
actually better classdef, now only breaks on esoteric line continuations
apozharski Jul 18, 2024
f21d59a
add comment regarding limitations
apozharski Jul 18, 2024
f4e2794
add test
apozharski Jul 18, 2024
5871153
fix typo
apozharski Jul 18, 2024
5f5c93a
fix duplicated rules and add support for metaclass literals
apozharski Jul 18, 2024
7de6a0c
fix test and allow comments in classdef line
apozharski Jul 19, 2024
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
143 changes: 91 additions & 52 deletions Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,49 +783,60 @@
<key>patterns</key>
<array>
<dict>
<key>name</key>
<string>storage.modifier.section.class.matlab</string>
<key>comment</key>
<string>This breaks if there is a line continuation between end of attrs and name, but works for line continuations inside attrs. Line continuations are a mistake.</string>
<key>begin</key>
<string>\G(\([^)]*\))?\s*</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<string>\G\(</string>
<key>end</key>
<string>\)(?=\s*\w+)</string>
<key>patterns</key>
<array>
<dict>
<key>comment</key>
<string>Optional attributes</string>
<key>patterns</key>
<array>
<dict>
<key>name</key>
<string>punctuation.section.parens.begin.matlab</string>
<key>match</key>
<string>(?&lt;=\s)\(</string>
</dict>
<key>name</key>
<string>punctuation.separator.modifier.comma.matlab</string>
<key>match</key>
<string>,</string>
</dict>
<dict>
<key>name</key>
<string>storage.modifier.class.matlab</string>
<key>match</key>
<string>[a-zA-Z][a-zA-Z0-9_]*</string>
</dict>
<dict>
<key>begin</key>
<string>(=)\s*</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.section.parens.end.matlab</string>
<key>match</key>
<string>\)\z</string>
<string>keyword.operator.assignment.matlab</string>
</dict>
</dict>
<key>end</key>
<string>(?=\)|,)</string>
<key>patterns</key>
<array>
<dict>
<key>name</key>
<string>punctuation.separator.modifier.comma.matlab</string>
<string>constant.language.boolean.matlab</string>
<key>match</key>
<string>,</string>
<string>true|false</string>
</dict>
<dict>
<key>name</key>
<string>storage.modifier.class.matlab</string>
<key>match</key>
<string>[a-zA-Z][a-zA-Z0-9_]*</string>
</dict>
<dict>
<string>meta.metaclass.matlab</string>
<key>begin</key>
<string>(=)\s*</string>
<string>(\?)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.assignment.matlab</string>
<string>keyword.operator.other.question.matlab</string>
</dict>
</dict>
<key>end</key>
Expand All @@ -834,46 +845,80 @@
<array>
<dict>
<key>name</key>
<string>constant.language.boolean.matlab</string>
<string>entity.other.class.matlab</string>
<key>match</key>
<string>true|false</string>
<string>(?&lt;=[\s.&lt;])[a-zA-Z][a-zA-Z0-9_]*(?=\s|,|\))</string>
</dict>
<dict>
<key>include</key>
<string>#string</string>
<key>name</key>
<string>entity.name.namespace.matlab</string>
<key>match</key>
<string>[a-zA-Z][a-zA-Z0-9_]*</string>
</dict>
<dict>
<key>name</key>
<string>punctuation.accessor.dot.matlab</string>
<key>match</key>
<string>\.</string>
</dict>
</array>
</dict>
<dict>
<key>include</key>
<string>#comments</string>
<string>#string</string>
</dict>
<dict>
<key>include</key>
<string>#curly_brackets</string>
</dict>
<dict>
<key>include</key>
<string>#line_continuation</string>
</dict>
</array>
</dict>
<dict>
<key>include</key>
<string>#comments</string>
</dict>
<dict>
<key>include</key>
<string>#line_continuation</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>\s*(\w+)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>comment</key>
<string>Class name</string>
<key>name</key>
<string>entity.name.type.class.matlab</string>
</dict>
</dict>
<key>end</key>
<string>(?&lt;!\.{3})(?=\s*%|\n)</string>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>\G\s*([a-zA-Z][a-zA-Z0-9_]*)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>comment</key>
<string>Class name</string>
<key>name</key>
<string>entity.name.type.class.matlab</string>
</dict>
</dict>
<string>\G</string>
<key>end</key>
<string>(?&lt;!\.{3})(?=\n)</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#comments</string>
</dict>
<dict>
<key>include</key>
<string>#line_continuation</string>
</dict>
<dict>
<key>comment</key>
<string>Optional inheritance operator</string>
Expand Down Expand Up @@ -921,14 +966,6 @@
<key>match</key>
<string>&amp;</string>
</dict>
<dict>
<key>include</key>
<string>#comments</string>
</dict>
<dict>
<key>include</key>
<string>#line_continuation</string>
</dict>
</array>
</dict>
<dict>
Expand All @@ -940,8 +977,10 @@
<string>#line_continuation</string>
</dict>
</array>
<key>end</key>
<string>(?&lt;!\.{3})(?=\s*%|\n)</string>
</dict>
<dict>
<key>include</key>
<string>#comments</string>
</dict>
</array>
</dict>
Expand Down
6 changes: 6 additions & 0 deletions test/t87ClassAttributes.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
% SYNTAX TEST "source.matlab" "Property validation: https://github.com/mathworks/MATLAB-Language-grammar/issues/87"
classdef (AllowedSubclasses = {?SubClass1,?SubClass2}) SuperClass
% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ storage.modifier.section.class.matlab
% ^^^^^^^^^^^^^^^^^^^^^ meta.cell.literal.matlab
% ^^^^^^^^^^ entity.name.type.class.matlab
end