Skip to content

Fix grammar when there is a line continuation after class attributes #94

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 1 commit into from
Sep 13, 2024
Merged

Fix grammar when there is a line continuation after class attributes #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,12 +789,10 @@
<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\(</string>
<key>end</key>
<string>\)(?=\s*\w+)</string>
<string>\)</string>
<key>patterns</key>
<array>
<dict>
Expand Down Expand Up @@ -961,6 +959,10 @@
<key>include</key>
<string>#comments</string>
</dict>
<dict>
<key>include</key>
<string>#line_continuation</string>
</dict>
</array>
</dict>
<dict>
Expand Down
17 changes: 17 additions & 0 deletions test/t93ContinuationAfterClassAttributes.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
% SYNTAX TEST "source.matlab" "Line continuation after class attributes: https://github.com/mathworks/MATLAB-Language-grammar/issues/93"

% Case 1: Line continuation without attributes
classdef ...
% ^^^ meta.class.declaration.matlab punctuation.separator.continuation.line.matlab
Class1
% ^^^^^^ meta.class.declaration.matlab entity.name.type.class.matlab
end

% Case 2: Line continuation with attributes
classdef (Abstract) ...
% ^^^^^^^^^^^^^^ meta.class.declaration.matlab
% ^^^^^^^^^^ storage.modifier.section.class.matlab
% ^^^ punctuation.separator.continuation.line.matlab
Class2
% ^^^^^^ meta.class.declaration.matlab entity.name.type.class.matlab
end
Loading