Merge pull request #650 from evandrocoan/matlab_block_comments

[Matlab] Fixed the block comment scope for the Matlab syntax
sublimehq · Nov 22, 2016 · d2b0502 · d2b0502
2 parents ce847b2 + bd2f4b6
commit d2b0502
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/Matlab/Matlab.sublime-syntax b/Matlab/Matlab.sublime-syntax
@@ -62,12 +62,12 @@ contexts:
       scope: comment.double.percentage.matlab
       captures:
         1: punctuation.definition.comment.matlab
-    - match: '%\{'
+    - match: '(%\{)\s*\n'
       captures:
         1: punctuation.definition.comment.matlab
       push:
         - meta_scope: comment.block.percentage.matlab
-        - match: '%\}\s*\n'
+        - match: '(%\})\s*\n'
           captures:
             1: punctuation.definition.comment.matlab
           pop: true

diff --git a/Matlab/Miscellaneous.tmPreferences b/Matlab/Miscellaneous.tmPreferences
@@ -38,6 +38,18 @@
 				<key>value</key>
 				<string>% </string>
 			</dict>
+			<dict>
+				<key>name</key>
+				<string>TM_COMMENT_START_2</string>
+				<key>value</key>
+				<string>%{\n</string>
+			</dict>
+			<dict>
+				<key>name</key>
+				<string>TM_COMMENT_END_2</string>
+				<key>value</key>
+				<string>%}\n</string>
+			</dict>
 		</array>
 		<key>smartTypingPairs</key>
 		<array>

diff --git a/Matlab/syntax_test_matlab.m b/Matlab/syntax_test_matlab.m
@@ -56,4 +56,24 @@
 
 
 
+%---------------------------------------------
+% Block comment test
+
+% Success case
+%{           
+x = 5
+% ^ source.matlab comment.block.percentage.matlab
+%}           
+
+% Failure case
+%{           fail
+x = 5
+% ^ source.matlab keyword.operator.symbols.matlab
+%}
+
+%{
+%}           fail
+x = 5
+% ^ source.matlab comment.block.percentage.matlab
+%}