Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit da6cb67

Browse files
committed
Allow whitespaces in method calls
1 parent 357da2e commit da6cb67

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

grammars/javascript.cson

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@
626626
'end': '(?!\\G)'
627627
'patterns': [
628628
{
629-
'begin': '\\b(\\.)(assert|clear|debug|error|info|log|profile|profileEnd|time|timeEnd|warn)\\s*(?=\\()'
629+
'begin': '\\s*(\\.)\\s*(assert|clear|debug|error|info|log|profile|profileEnd|time|timeEnd|warn)\\s*(?=\\()'
630630
'beginCaptures':
631631
'1':
632632
'name': 'meta.delimiter.method.period.js'
@@ -1195,7 +1195,7 @@
11951195
'patterns': [
11961196
{
11971197
# .methodCall(arg1, "arg2", [...])
1198-
'begin': '(\\.)([\\w$]+)\\s*(?=\\()'
1198+
'begin': '(\\.)\\s*([\\w$]+)\\s*(?=\\()'
11991199
'beginCaptures':
12001200
'1':
12011201
'name': 'meta.delimiter.method.period.js'

spec/javascript-spec.coffee

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,6 +1181,11 @@ describe "Javascript grammar", ->
11811181
expect(tokens[6]).toEqual value: '1', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'constant.numeric.decimal.js']
11821182
expect(tokens[7]).toEqual value: ')', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.end.bracket.round.js']
11831183

1184+
{tokens} = grammar.tokenizeLine('a . b(1+1)')
1185+
expect(tokens[2]).toEqual value: '.', scopes: ['source.js', 'meta.method-call.js', 'meta.delimiter.method.period.js']
1186+
expect(tokens[4]).toEqual value: 'b', scopes: ['source.js', 'meta.method-call.js', 'entity.name.function.js']
1187+
expect(tokens[5]).toEqual value: '(', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.begin.bracket.round.js']
1188+
11841189
{tokens} = grammar.tokenizeLine('a.$abc$()')
11851190
expect(tokens[2]).toEqual value: '$abc$', scopes: ['source.js', 'meta.method-call.js', 'entity.name.function.js']
11861191

@@ -1406,6 +1411,13 @@ describe "Javascript grammar", ->
14061411
expect(tokens[3]).toEqual value: '(', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.begin.bracket.round.js']
14071412
expect(tokens[4]).toEqual value: ')', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.end.bracket.round.js']
14081413

1414+
{tokens} = grammar.tokenizeLine('console . log()')
1415+
expect(tokens[0]).toEqual value: 'console', scopes: ['source.js', 'entity.name.type.object.console.js']
1416+
expect(tokens[2]).toEqual value: '.', scopes: ['source.js', 'meta.method-call.js', 'meta.delimiter.method.period.js']
1417+
expect(tokens[4]).toEqual value: 'log', scopes: ['source.js', 'meta.method-call.js', 'support.function.console.js']
1418+
expect(tokens[5]).toEqual value: '(', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.begin.bracket.round.js']
1419+
expect(tokens[6]).toEqual value: ')', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.end.bracket.round.js']
1420+
14091421
describe "indentation", ->
14101422
editor = null
14111423

0 commit comments

Comments
 (0)