Tokenize function body properly

MaximSokolov · MaximSokolov · commit e7ca46a589ef · 2016-02-20T20:42:41.000+03:00
diff --git a/grammars/javascript.cson b/grammars/javascript.cson
@@ -286,6 +286,12 @@
     'begin': '(?=(\\basync\\b\\s*)?\\bfunction\\b)'
     'end': '(?<=})'
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=\\))'
@@ -296,19 +302,19 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {
     # [.]foo = function...
     'begin': '(?=(\\.)?[a-zA-Z_$][\\w$]*\\s*=\\s*(\\basync\\b\\s*)?\\bfunction\\b)'
     'end': '(?<=})'
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=\\))'
@@ -329,19 +335,19 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {
     # foo: function...
     'begin': '(?=\\b[a-zA-Z_$][\\w$]*\\s*:\\s*(\\basync\\b\\s*)?\\bfunction\\b)'
     'end': '(?<=})'
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=\\))'
@@ -360,19 +366,19 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {
     # "foo": function...
     'begin': '(?=((\'[^\']*?\')|("[^"]*?"))\\s*:\\s*(\\basync\\b\\s*)?\\bfunction\\b)'
     'end': '(?<=})'
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=\\))'
@@ -405,12 +411,6 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {
@@ -430,6 +430,12 @@
     '''
     'end': '(?<=})'
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=\\))'
@@ -444,12 +450,6 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {
@@ -471,6 +471,12 @@
       )(?=\\s*\\S))
     '''
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=(=>))'
@@ -481,12 +487,6 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {
@@ -509,6 +509,12 @@
       )(?=\\s*\\S))
     '''
     'patterns': [
+      {
+        'include': '#comments'
+      }
+      {
+        'include': '#function_body'
+      }
       {
         'begin': '\\G'
         'end': '(?<=(=>))'
@@ -529,12 +535,6 @@
           }
         ]
       }
-      {
-        'include': '#function_body'
-      }
-      {
-        'include': '#comments'
-      }
     ]
   }
   {

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,12 @@`
`286`	`286`	`'begin': '(?=(\\basync\\b\\s*)?\\bfunction\\b)'`
`287`	`287`	`'end': '(?<=})'`
`288`	`288`	`'patterns': [`
	`289`	`+ {`
	`290`	`+ 'include': '#comments'`
	`291`	`+ }`
	`292`	`+ {`
	`293`	`+ 'include': '#function_body'`
	`294`	`+ }`
`289`	`295`	`{`
`290`	`296`	`'begin': '\\G'`
`291`	`297`	`'end': '(?<=\\))'`
`@@ -296,19 +302,19 @@`
`296`	`302`	`}`
`297`	`303`	`]`
`298`	`304`	`}`
`299`		`- {`
`300`		`- 'include': '#function_body'`
`301`		`- }`
`302`		`- {`
`303`		`- 'include': '#comments'`
`304`		`- }`
`305`	`305`	`]`
`306`	`306`	`}`
`307`	`307`	`{`
`308`	`308`	`# [.]foo = function...`
`309`	`309`	`'begin': '(?=(\\.)?[a-zA-Z_$][\\w$]\\s=\\s(\\basync\\b\\s)?\\bfunction\\b)'`
`310`	`310`	`'end': '(?<=})'`
`311`	`311`	`'patterns': [`
	`312`	`+ {`
	`313`	`+ 'include': '#comments'`
	`314`	`+ }`
	`315`	`+ {`
	`316`	`+ 'include': '#function_body'`
	`317`	`+ }`
`312`	`318`	`{`
`313`	`319`	`'begin': '\\G'`
`314`	`320`	`'end': '(?<=\\))'`
`@@ -329,19 +335,19 @@`
`329`	`335`	`}`
`330`	`336`	`]`
`331`	`337`	`}`
`332`		`- {`
`333`		`- 'include': '#function_body'`
`334`		`- }`
`335`		`- {`
`336`		`- 'include': '#comments'`
`337`		`- }`
`338`	`338`	`]`
`339`	`339`	`}`
`340`	`340`	`{`
`341`	`341`	`# foo: function...`
`342`	`342`	`'begin': '(?=\\b[a-zA-Z_$][\\w$]\\s:\\s(\\basync\\b\\s)?\\bfunction\\b)'`
`343`	`343`	`'end': '(?<=})'`
`344`	`344`	`'patterns': [`
	`345`	`+ {`
	`346`	`+ 'include': '#comments'`
	`347`	`+ }`
	`348`	`+ {`
	`349`	`+ 'include': '#function_body'`
	`350`	`+ }`
`345`	`351`	`{`
`346`	`352`	`'begin': '\\G'`
`347`	`353`	`'end': '(?<=\\))'`
`@@ -360,19 +366,19 @@`
`360`	`366`	`}`
`361`	`367`	`]`
`362`	`368`	`}`
`363`		`- {`
`364`		`- 'include': '#function_body'`
`365`		`- }`
`366`		`- {`
`367`		`- 'include': '#comments'`
`368`		`- }`
`369`	`369`	`]`
`370`	`370`	`}`
`371`	`371`	`{`
`372`	`372`	`# "foo": function...`
`373`	`373`	`'begin': '(?=((\'[^\']?\')\|("[^"]?"))\\s:\\s(\\basync\\b\\s*)?\\bfunction\\b)'`
`374`	`374`	`'end': '(?<=})'`
`375`	`375`	`'patterns': [`
	`376`	`+ {`
	`377`	`+ 'include': '#comments'`
	`378`	`+ }`
	`379`	`+ {`
	`380`	`+ 'include': '#function_body'`
	`381`	`+ }`
`376`	`382`	`{`
`377`	`383`	`'begin': '\\G'`
`378`	`384`	`'end': '(?<=\\))'`
`@@ -405,12 +411,6 @@`
`405`	`411`	`}`
`406`	`412`	`]`
`407`	`413`	`}`
`408`		`- {`
`409`		`- 'include': '#function_body'`
`410`		`- }`
`411`		`- {`
`412`		`- 'include': '#comments'`
`413`		`- }`
`414`	`414`	`]`
`415`	`415`	`}`
`416`	`416`	`{`
`@@ -430,6 +430,12 @@`
`430`	`430`	`'''`
`431`	`431`	`'end': '(?<=})'`
`432`	`432`	`'patterns': [`
	`433`	`+ {`
	`434`	`+ 'include': '#comments'`
	`435`	`+ }`
	`436`	`+ {`
	`437`	`+ 'include': '#function_body'`
	`438`	`+ }`
`433`	`439`	`{`
`434`	`440`	`'begin': '\\G'`
`435`	`441`	`'end': '(?<=\\))'`
`@@ -444,12 +450,6 @@`
`444`	`450`	`}`
`445`	`451`	`]`
`446`	`452`	`}`
`447`		`- {`
`448`		`- 'include': '#function_body'`
`449`		`- }`
`450`		`- {`
`451`		`- 'include': '#comments'`
`452`		`- }`
`453`	`453`	`]`
`454`	`454`	`}`
`455`	`455`	`{`
`@@ -471,6 +471,12 @@`
`471`	`471`	`)(?=\\s*\\S))`
`472`	`472`	`'''`
`473`	`473`	`'patterns': [`
	`474`	`+ {`
	`475`	`+ 'include': '#comments'`
	`476`	`+ }`
	`477`	`+ {`
	`478`	`+ 'include': '#function_body'`
	`479`	`+ }`
`474`	`480`	`{`
`475`	`481`	`'begin': '\\G'`
`476`	`482`	`'end': '(?<=(=>))'`
`@@ -481,12 +487,6 @@`
`481`	`487`	`}`
`482`	`488`	`]`
`483`	`489`	`}`
`484`		`- {`
`485`		`- 'include': '#function_body'`
`486`		`- }`
`487`		`- {`
`488`		`- 'include': '#comments'`
`489`		`- }`
`490`	`490`	`]`
`491`	`491`	`}`
`492`	`492`	`{`
`@@ -509,6 +509,12 @@`
`509`	`509`	`)(?=\\s*\\S))`
`510`	`510`	`'''`
`511`	`511`	`'patterns': [`
	`512`	`+ {`
	`513`	`+ 'include': '#comments'`
	`514`	`+ }`
	`515`	`+ {`
	`516`	`+ 'include': '#function_body'`
	`517`	`+ }`
`512`	`518`	`{`
`513`	`519`	`'begin': '\\G'`
`514`	`520`	`'end': '(?<=(=>))'`
`@@ -529,12 +535,6 @@`
`529`	`535`	`}`
`530`	`536`	`]`
`531`	`537`	`}`
`532`		`- {`
`533`		`- 'include': '#function_body'`
`534`		`- }`
`535`		`- {`
`536`		`- 'include': '#comments'`
`537`		`- }`
`538`	`538`	`]`
`539`	`539`	`}`
`540`	`540`	`{`