@@ -113,9 +113,9 @@ repository:
     - include: '#literal-module'
     # before function calls, to differentiate methods from them
     - include: '#literal-method'
+    - include: '#literal-function-constructor'
 
     - include: '#literal-function-call'
-    - include: '#literal-function-constructor'
 
     - include: '#literal-labels'
     - include: '#literal-variable'
@@ -282,21 +282,6 @@ repository:
         '2': {name: meta.group.braces.round.function.arguments.js}
         '3': {name: meta.brace.round.js}
 
-    # e.g. function(one,two,...)\n?{...}
-    - name: meta.function.js
-      begin: |-
-        (?x)
-          \b(function\*?)
-          (?=
-            (?:\b(?:[_$a-zA-Z][_$\w]*))? \s*  # The function name
-            \(.*?\)                           # The properties that the function accepts
-          )
-      beginCaptures:
-        '1': {name: storage.type.function.js}
-      end: (?<=})(\s*\n)?
-      patterns:
-      - include: source.js
-
     # ES6 methods, e.g. abc(x, y, z){
     - name: meta.method.js
       match: |-
 
@@ -304,11 +304,11 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#literal-function-call</string>
+					<string>#literal-function-constructor</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#literal-function-constructor</string>
+					<string>#literal-function-call</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -1225,34 +1225,6 @@
 					<key>name</key>
 					<string>meta.function-call.method.without-arguments.js</string>
 				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(?x)
-  \b(function\*?)
-  (?=
-    (?:\b(?:[_$a-zA-Z][_$\w]*))? \s*  # The function name
-    \(.*?\)                           # The properties that the function accepts
-  )</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>storage.type.function.js</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(?&lt;=})(\s*\n)?</string>
-					<key>name</key>
-					<string>meta.function.js</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>source.js</string>
-						</dict>
-					</array>
-				</dict>
 				<dict>
 					<key>captures</key>
 					<dict>