Merge pull request #588 from zcei/grammar-bigint · blacknode404/language-javascript@0bbdc0e · GitHub

1. blacknode404
2. language-javascript

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 0bbdc0e

Browse filesBrowse the repository at this point in the historyBrowse files

lkashef

authored

Merge pull request atom#588 from zcei/grammar-bigint

Add support for BigInt numeric

2 parents 2035549 + f17feaa commit 0bbdc0e
Copy full SHA for 0bbdc0e

2 files changed

+25-4Lines changed: 25 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• grammars
  • javascript.cson
• spec
  • javascript-spec.coffee

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎grammars/javascript.cson‎

Copy file name to clipboardExpand all lines: grammars/javascript.cson

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -1244,15 +1244,15 @@
1244	1244	'numbers':
1245	1245	'patterns': [
1246	1246	{
1247		- 'match': '\\b(?<!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)'
	1247	+ 'match': '\\b(?<!\\$)0(x|X)[0-9a-fA-F]+n?\\b(?!\\$)'
1248	1248	'name': 'constant.numeric.hex.js'
1249	1249	}
1250	1250	{
1251		- 'match': '\\b(?<!\\$)0(b|B)[01]+\\b(?!\\$)'
	1251	+ 'match': '\\b(?<!\\$)0(b|B)[01]+n?\\b(?!\\$)'
1252	1252	'name': 'constant.numeric.binary.js'
1253	1253	}
1254	1254	{
1255		- 'match': '\\b(?<!\\$)0(o|O)?[0-7]+\\b(?!\\$)'
	1255	+ 'match': '\\b(?<!\\$)0(o|O)?[0-7]+n?\\b(?!\\$)'
1256	1256	'name': 'constant.numeric.octal.js'
1257	1257	}
1258	1258	{
@@ -1265,7 +1265,7 @@
1265	1265	(?:\\b[0-9]+(\\.)[0-9]+\\b)| # 1.1
1266	1266	(?:\\b[0-9]+(\\.)\\B)| # 1.
1267	1267	(?:\\B(\\.)[0-9]+\\b)| # .1
1268		- (?:\\b[0-9]+\\b(?!\\.)) # 1
	1268	+ (?:\\b[0-9]+n?\\b(?!\\.)) # 1n
1269	1269	)(?!\\$)
1270	1270	'''
1271	1271	'captures':

Collapse file

‎spec/javascript-spec.coffee‎

Copy file name to clipboardExpand all lines: spec/javascript-spec.coffee

+21Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -317,27 +317,48 @@ describe "JavaScript grammar", ->
317	317	{tokens} = grammar.tokenizeLine('0X1D306')
318	318	expect(tokens[0]).toEqual value: '0X1D306', scopes: ['source.js', 'constant.numeric.hex.js']
319	319
	320	+ {tokens} = grammar.tokenizeLine('0x1D306n')
	321	+ expect(tokens[0]).toEqual value: '0x1D306n', scopes: ['source.js', 'constant.numeric.hex.js']
	322	+
	323	+ {tokens} = grammar.tokenizeLine('0X1D306n')
	324	+ expect(tokens[0]).toEqual value: '0X1D306n', scopes: ['source.js', 'constant.numeric.hex.js']
	325	+
320	326	it "tokenizes binary literals", ->
321	327	{tokens} = grammar.tokenizeLine('0b011101110111010001100110')
322	328	expect(tokens[0]).toEqual value: '0b011101110111010001100110', scopes: ['source.js', 'constant.numeric.binary.js']
323	329
324	330	{tokens} = grammar.tokenizeLine('0B011101110111010001100110')
325	331	expect(tokens[0]).toEqual value: '0B011101110111010001100110', scopes: ['source.js', 'constant.numeric.binary.js']
326	332
	333	+ {tokens} = grammar.tokenizeLine('0b011101110111010001100110n')
	334	+ expect(tokens[0]).toEqual value: '0b011101110111010001100110n', scopes: ['source.js', 'constant.numeric.binary.js']
	335	+
	336	+ {tokens} = grammar.tokenizeLine('0B011101110111010001100110n')
	337	+ expect(tokens[0]).toEqual value: '0B011101110111010001100110n', scopes: ['source.js', 'constant.numeric.binary.js']
	338	+
327	339	it "tokenizes octal literals", ->
328	340	{tokens} = grammar.tokenizeLine('0o1411')
329	341	expect(tokens[0]).toEqual value: '0o1411', scopes: ['source.js', 'constant.numeric.octal.js']
330	342
331	343	{tokens} = grammar.tokenizeLine('0O1411')
332	344	expect(tokens[0]).toEqual value: '0O1411', scopes: ['source.js', 'constant.numeric.octal.js']
333	345
	346	+ {tokens} = grammar.tokenizeLine('0o1411n')
	347	+ expect(tokens[0]).toEqual value: '0o1411n', scopes: ['source.js', 'constant.numeric.octal.js']
	348	+
	349	+ {tokens} = grammar.tokenizeLine('0O1411n')
	350	+ expect(tokens[0]).toEqual value: '0O1411n', scopes: ['source.js', 'constant.numeric.octal.js']
	351	+
334	352	{tokens} = grammar.tokenizeLine('0010')
335	353	expect(tokens[0]).toEqual value: '0010', scopes: ['source.js', 'constant.numeric.octal.js']
336	354
337	355	it "tokenizes decimals", ->
338	356	{tokens} = grammar.tokenizeLine('1234')
339	357	expect(tokens[0]).toEqual value: '1234', scopes: ['source.js', 'constant.numeric.decimal.js']
340	358
	359	+ {tokens} = grammar.tokenizeLine('123456789n')
	360	+ expect(tokens[0]).toEqual value: '123456789n', scopes: ['source.js', 'constant.numeric.decimal.js']
	361	+
341	362	{tokens} = grammar.tokenizeLine('5e-10')
342	363	expect(tokens[0]).toEqual value: '5e-10', scopes: ['source.js', 'constant.numeric.decimal.js']
343	364

0 commit comments

Comments

0 (0)