Updated the Matlab/Octave syntax with the last fixes.

sublimehq/Packages#650
evandrocoan · Sep 30, 2016 · 148f67f · 148f67f
1 parent f9b9bf4
commit 148f67f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/Matlab/Matlab.sublime-syntax b/Matlab/Matlab.sublime-syntax
@@ -62,7 +62,7 @@ contexts:
       scope: comment.double.percentage.matlab
       captures:
         1: punctuation.definition.comment.matlab
-    - match: '%\{'
+    - match: '%\{\s*\n'
       captures:
         1: punctuation.definition.comment.matlab
       push:

diff --git a/Matlab/syntax_test_matlab.m b/Matlab/syntax_test_matlab.m
@@ -41,19 +41,39 @@
 x = [ 1.76 ]
 % <- source.matlab meta.variable.other.valid.matlab
 % ^ source.matlab keyword.operator.symbols.matlab
-%   ^ source.matlab punctuation.definition.brackets.begin.matlab 
+%   ^ source.matlab punctuation.section.brackets.begin.matlab 
 %     ^ source.matlab meta.brackets.matlab constant.numeric.matlab  
-%          ^ source.matlab punctuation.definition.brackets.end.matlab
+%          ^ source.matlab punctuation.section.brackets.end.matlab
 
 
 xAprox = fMetodoDeNewton( xi )
 %  <- source.matlab meta.variable.other.valid.matlab
 %      ^ source.matlab keyword.operator.symbols.matlab
 %        ^ source.matlab meta.variable.other.valid.matlab
-%                       ^ source.matlab punctuation.definition.parens.begin.matlab 
+%                       ^ source.matlab punctuation.section.parens.begin.matlab 
 %                         ^ source.matlab meta.parens.matlab meta.variable.other.valid.matlab
-%                            ^ source.matlab punctuation.definition.parens.end.matlab 
+%                            ^ source.matlab punctuation.section.parens.end.matlab 
 
 
 
+%---------------------------------------------
+% 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
+%}
 
diff --git a/Octave/Octave.sublime-syntax b/Octave/Octave.sublime-syntax
@@ -9,11 +9,11 @@ contexts:
     - match: ''
       push: Packages/Matlab/Matlab.sublime-syntax
       with_prototype:
-        - match: '[#%]{.*\n'
+        - match: '[#%]{\s*\n'
           scope: comment.line.octave
           push:
             - meta_scope: comment.line.octave
-            - match: '[#%]}.*\n'
+            - match: '[#%]}\s*\n'
               scope: comment.line.octave
               pop: true
         - match: '#.*\n'