Operater optimization

WolframLanguage.sublime-syntax

@@ -10,7 +10,6 @@ file_extensions:
   - m
   - wl
   - wls
-  # FIXME: special process when rendering .nb file
   - nb
 
 first_line_match: ^#!.*\b(math|wolfram).*$
@@ -19,8 +18,9 @@ scope: source.wolfram
 # Partly based on https://github.com/JuliaEditorSupport/Julia-sublime/blob/master/Julia.sublime-syntax
 
 variables:
+  number: (?:\d+\.?|\.\d)\d*
   symbol: '[$[:alpha:]]+[$[:alnum:]]*'
-  identifier: (?:{{symbol}}`)*({{symbol}})
+  identifier: (?:{{symbol}}`)*{{symbol}}
 
   # Built-in functions
   built_in_functions: |-
@@ -47,16 +47,33 @@ variables:
       Catalan|Degree|E|EulerGamma|Glaisher|GoldenAngle|GoldenRatio|I|Khinchin|MachinePrecision|Pi
     )\b
 
+  first_param_functional_functions: |-
+    (?x)
+    Apply|ArrayFilter|
+    BlockMap|
+    FixedPoint|FixedPointList|Fold|FoldList|FoldPair|FoldPairList|
+    Map|MapAt|MapIndexed|MapThread|
+    Nest|NestList|NestGraph|NestWhile|NestWhileList|
+    Scan|SequenceFold|SequenceFoldList
+
+  last_param_functional_functions: |-
+    (?x)
+    CountDistinctBy|LengthWhile|TakeWhile
+
+  parametic_functions: Table|Do|Sum|Product
+
+  scoping_functions: Block|Module|With|Function
+
   nb_code_styles: (Input)
 
 
 contexts:
 
   main:
-    - include: declarations
     - include: expressions
 
   expressions:
+    - include: declarations
     - include: pattern
     - include: expressions-nopattern
 
@@ -66,13 +83,12 @@ contexts:
     - include: shorthand
     - include: operators
     - include: pattern-short
-    - include: scoping
     - include: function
     - include: variable
     - include: nested
 
   comments:
-    - match: '(\(\*\s*)(::)([[:alnum:]]+)(::)(\s*\*\))'
+    - match: (\(\*\s*)(::)([[:alnum:]]+)(::)(\s*\*\))
       captures:
         1: comment.line.wolfram
         2: constant.numeric.line-number.find-in-files
@@ -90,14 +106,19 @@ contexts:
         pop: true
 
   literals:
-    - match: (?:\d+\.?|\.\d)\d*\`{0,2}
+    # numbers, with base, scientific notation, precision or accuracy
+    - match: ([0-9]+\^\^)?{{number}}(\`\`?({{number}})?)?(\*\^{{number}})?
       scope: constant.numeric.wolfram
+
+    # built-in symbols
     - match: ((?:System`)?{{built_in_numeric_constants}})
       scope: constant.numeric.wolfram
     - match: ((?:System`)?{{built_in_constants}})
       scope: constant.language.wolfram
     - match: ((?:System`)?{{built_in_options}})
-      scope: variable.function.wolfram
+      scope: variable.parameter.wolfram
+
+    # strings
     - match: \"
       scope: punctuation.definition.string.begin
       push:
@@ -115,15 +136,33 @@ contexts:
           scope: constant.other.placeholder.wolfram
 
   shorthand:
+    # Out
+    - match: '%(\d*|%*)'
+      scope: storage.type.Out.wolfram
+
+    # MessageName
     - match: (::)\s*([[:alnum:]]+)
       captures:
         1: keyword.operator.MessageName.wolfram
         2: string.unquoted.wolfram
-    # ENHANCEMENT: infix
-    - match: (//)\s*({{identifier}})
+
+    # Infix
+    - match: ~
+      scope: keyword.operator.call.wolfram
+      push:
+        - meta_content_scope: meta.infix.wolfram
+        - match: ({{identifier}})?\s*(~)
+          captures:
+            1: variable.function.wolfram
+            2: keyword.operator.call.wolfram
+          pop: true
+        - include: expressions
+
+    # Postfix and compound functions
+    - match: (//|[@/]\*)\s*({{identifier}})
       captures:
-        1: keyword.operator.Postfix.wolfram
-        3: variable.function.wolfram
+        1: keyword.operator.call.wolfram
+        2: variable.function.wolfram
 
   operators:
     - match: (@\*|@{1,3}|\/[@*])
@@ -136,28 +175,30 @@ contexts:
       scope: keyword.operator.logical.wolfram
     - match: (:?=|\/:|[-:]>|[+\-*/]=|<->)
       scope: keyword.operator.assignment.wolfram
-    - match: '\/;'
+    - match: \/;
       scope: keyword.operator.condition.wolfram
-    - match: (\+\+|--|[+\-*/])
+    - match: (\+\+|--|[+\-*/^])
       scope: keyword.operator.arithmetic.wolfram
     - match: (>>>?|<<<?)
       scope: keyword.operator.flow.wolfram
     - match: (<>|~~)
       scope: keyword.operator.string.wolfram
     - match: \.\.\.?
       scope: keyword.operator.repeat.wolfram
-    - match: ';;'
+    - match: ;;
       scope: keyword.operator.span.wolfram
-    - match: ';'
+    - match: ;
       scope: keyword.operator.compound.wolfram
     - match: \\\[[[:alnum:]]+\]
       scope: keyword.operator.word.wolfram
     - match: '&'
-      scope: keyword.operator.function.wolfram
+      scope: keyword.operator.function variable.function.wolfram
+    - match: \?\??
+      scope: keyword.operator.definition.wolfram
 
   pattern-short:
-    # Including Blank, BlankSequence, BlankNullSequence
-    # Can also be matched with Pattern, PatternTest, Optional
+    # support Blank, BlankSequence, BlankNullSequence
+    # can also be matched with Pattern, PatternTest, Optional
     - match: ({{identifier}})?(_{1,3})(({{identifier}})?)
       scope: variable.parameter.wolfram
       push:
@@ -174,70 +215,108 @@ contexts:
           pop: true
 
   pattern:
-    - match: '({{identifier}})\s*(:(?=[^:>=]))'
+    - match: ({{identifier}})\s*(:(?=[^:>=]))
       captures:
         1: variable.parameter.wolfram
         3: keyword.operator.Pattern.wolfram
       push:
         - meta_content_scope: meta.pattern.wolfram
         - match: \?
           scope: keyword.operator.PatternTest.wolfram
-        - match: ':(?=[^:>=])'
+        - match: :(?=[^:>=])
           scope: keyword.operator.Optional.wolfram
           pop: true
         # we should check the precedence here
         - match: (?=[:-]>|:?=|\/[;.\/]|[\]\)\},;&]|>>|<<)
           pop: true
         - include: expressions-nopattern
 
-  function:
-    - match: ({{identifier}})\s*(\[(?!\[))
-      captures:
-        1: variable.function.wolfram
-        3: punctuation.section.brackets.begin.wolfram
-      push: 
-        - meta_scope: meta.block.wolfram
-        - match: \]
-          scope: punctuation.section.brackets.end.wolfram
-          pop: true
-        - include: expressions
-    - match: ({{identifier}})(?=\s*(@\*|@{1,3}|\/[@*]))
-      scope: variable.function.wolfram
-
   variable:
-    - match: '(?:System`)?({{built_in_functions}})'
+    - match: (?:System`)?({{built_in_functions}})
       scope: variable.function
     - match: '{{identifier}}'
       scope: variable.other
     - match: (#[a-zA-Z][[:alnum:]]*|#\d*)
       scope: variable.parameter
 
-  scoping:
-    - match: (Block|Module|With|Function)\s*(\[(?!\[))
+  function:
+    # parametic functions
+    - match: ({{parametic_functions}})\s*(\[(?!\[))
+      captures:
+        1: variable.function.parametic.wolfram
+        2: punctuation.section.brackets.begin.wolfram
+      push:
+        - meta_content_scope: meta.block.wolfram
+        - match: ','
+          scope: punctuation.separator.sequence.wolfram
+          push: parameter
+        - include: meta-block
+
+    # scoping functions
+    - match: ({{scoping_functions}})\s*(\[(?!\[))
       captures:
         1: variable.function.scoping.wolfram
         2: punctuation.section.brackets.begin.wolfram
       push:
         - meta_content_scope: meta.block.wolfram
-        - match: '\{'
+        - match: \{
+          scope: punctuation.section.braces.begin.wolfram
           set: [localized, local]
-        - match: '\]'
-          scope: punctuation.section.brackets.end.wolfram
+        - include: meta-block
+
+    # functional functions
+    - match: ({{first_param_functional_functions}})\s*(\[)\s*({{identifier}})
+      captures:
+        1: variable.function.scoping.wolfram
+        2: punctuation.section.brackets.begin.wolfram
+        3: variable.function.wolfram
+      push: meta-block
+    - match: ({{last_param_functional_functions}})\s*(\[(?!\[))
+      captures:
+        1: variable.function.scoping.wolfram
+        2: punctuation.section.brackets.begin.wolfram
+      push:
+        - meta_content_scope: meta.block.wolfram
+        - match: ({{identifier}})\s*\]
+          captures:
+            1: variable.function.wolfram
+            2: punctuation.section.brackets.end.wolfram
           pop: true
-        - include: expressions
+        - include: meta-block
+
+    # general functions
+    - match: ({{identifier}})\s*(\[(?!\[))
+      captures:
+        1: variable.function.wolfram
+        3: punctuation.section.brackets.begin.wolfram
+      push: meta-block
+    - match: ({{identifier}})\s*(?=@{1,3}|//?@)
+      scope: variable.function.wolfram
+
+  parameter:
+    - match: (\{)\s*({{symbol}})
+      captures:
+        1: punctuation.section.braces.begin.wolfram
+        2: variable.parameter.wolfram
+      push: meta-parameter
+    - match: (?=\S)
+      pop: true
 
   localized:
     - meta_content_scope: meta.block.local.wolfram
-    - match: '\,'
+    - match: ','
+      scope: punctuation.separator.sequence.wolfram
       push: local
-    - match: '\}'
+    - match: \}
+      scope: punctuation.section.braces.end.wolfram
       set:
         - meta_content_scope: meta.block.wolfram
-        - match: '\]'
+        - match: \]
           scope: punctuation.section.brackets.end.wolfram
           pop: true
         - include: expressions
-    - match: '\]'
+    - match: \]
+      scope: punctuation.section.brackets.end.wolfram
       pop: true
     - include: expressions
 
@@ -278,8 +357,22 @@ contexts:
             - include: sequence
         - match: (?=[^\[])
           pop: true
-    - match: ((?:{{symbol}}`)*(\${{symbol}}))(?=\s*:?=)
-      scope: entity.name.constant.wolfram
+    # - match: ((?:{{symbol}}`)*(\${{symbol}}))(?=\s*:?=)
+    #   scope: entity.name.constant.wolfram
+    - match: |-
+        (?x)
+        {{identifier}}
+        (?=
+          \s*:?=\s*
+          (
+            [^\(\)]+|
+            \((?>\g<-1>)*\)
+          )*
+          &(;|$)
+        )
+      scope: entity.name.function.wolfram
+    - match: ({{identifier}})(?=\s*:?=\s*Function\s*\[(?!\s*\[))
+      scope: entity.name.function.wolfram
 
   sequence:
     - meta_scope: meta.sequence.wolfram
@@ -330,3 +423,17 @@ contexts:
           scope: punctuation.section.association.end.wolfram
           pop: true
         - include: expressions
+
+  meta-block:
+    - meta_scope: meta.block.wolfram
+    - match: \]
+      scope: punctuation.section.brackets.end.wolfram
+      pop: true
+    - include: expressions
+
+  meta-parameter:
+    - meta_scope: meta.parameter.wolfram
+    - match: \}
+      scope: punctuation.section.braces.end.wolfram
+      pop: true
+    - include: expressions