Give priority to strings in functions

Fixes #175

Author: winstliu

grammars/javascript.cson

@@ -626,6 +626,9 @@
           {
             'include': '#function-params'
           }
+          {
+            'include': '#strings'
+          }
         ]
 
         'end': '(\\))'

spec/javascript-spec.coffee

@@ -304,7 +304,7 @@ describe "Javascript grammar", ->
       expect(tokens[0]).toEqual value: 'yield', scopes: ['source.js', 'meta.control.yield.js', 'keyword.control.js']
       expect(tokens[2]).toEqual value: '*', scopes: ['source.js', 'meta.control.yield.js', 'storage.modifier.js']
 
-  it "doesn't confuse strings and functions (regression)", ->
+  it "doesn't confuse strings and functions", ->
     {tokens} = grammar.tokenizeLine("'a'.b(':c(d)')")
 
     expect(tokens[0]).toEqual value: "'", scopes: ['source.js', 'string.quoted.single.js', 'punctuation.definition.string.begin.js']
@@ -318,6 +318,15 @@ describe "Javascript grammar", ->
     expect(tokens[8]).toEqual value: "'", scopes: ['source.js', 'string.quoted.single.js', 'punctuation.definition.string.end.js']
     expect(tokens[9]).toEqual value: ")", scopes: ['source.js', 'meta.brace.round.js']
 
+    {tokens} = grammar.tokenizeLine('write("){");')
+    expect(tokens[0]).toEqual value: 'write', scopes: ['source.js', 'meta.method.js', 'entity.name.function.js']
+    expect(tokens[1]).toEqual value: '(', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.begin.js']
+    expect(tokens[2]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.begin.js']
+    expect(tokens[3]).toEqual value: '){', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js']
+    expect(tokens[4]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.end.js']
+    expect(tokens[5]).toEqual value: ')', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.end.js']
+    expect(tokens[6]).toEqual value: ';', scopes: ['source.js', 'punctuation.terminator.statement.js']
+
   describe "default: in a switch statement", ->
     it "tokenizes it as a keyword", ->
       {tokens} = grammar.tokenizeLine('default: ')