updated grammar for tsx

[stepancar]

Hello @basarat! Yesterday i fixed #666, but it breaks
this grammar supports typescript (shameless copy from sublime-typescript it's better then babel grammar because for typescript :)
Please, check

[basarat]

@stepancar awesome ... I've been meaning to be lazy and just let MS handle the grammar... how are you doing the conversion ... can you document the steps so I can keep it updated? 🌹

[stepancar]

document the steps? I just downloaded sublime-typescript grammar , then converted to json usung this tool then converted to cson using thist tool then just puted to atom-typescript, then smiled))

[basarat]

Released with https://github.com/TypeStrong/atom-typescript/releases/tag/v7.4.4 🌹

[basarat]

Colors (and tokens) are bit different between tsx and ts :

:-/ Guess we might need to change a few token scope names

[blakeembrey]

If you generated one from Sublime, why not just do the other too? Or has there been a lot of custom improvements over Sublime? I'm wondering, also, if someone could bring this into a common core for grammars in TypeScript to avoid this kind of duplicate work.

[basarat]

I'm wondering, also, if someone could bring this into a common core for grammars in TypeScript to avoid this kind of duplicate work.

Agreed ... we have very little custom work ... and I moved that up the top :

atom-typescript/grammars/typescript.cson

Lines 12 to 80 in 729b552

	####
	# Rules that no one should change
	# These are used by code to provide fancy completions
	####
	{
	'comment': 'Match debugger statement'
	'match': '\\s*(debugger)[\\s;]+'
	'captures':
	'1':
	'name':'keyword.debugger.ts'
	}
	{
	'comment': 'Match full triple slash reference comments'
	'match': '(\\/\\/\\/\\s*<reference\\s*path\\s*=)(.*)(\\/>)'
	'captures':
	'1':
	'name':'keyword.other.ts'
	'2':
	'name':'reference.path.string'
	'3':
	'name':'keyword.other.ts'
	}
	{
	'comment': 'Match <amd-dependency'
	'match': '(\\/\\/\\/\\s*<amd-dependency\\s*path\\s*=)(.*)(\\/>)'
	'captures':
	'1':
	'name':'keyword.other.ts'
	'2':
	'name':'amd.path.string'
	'3':
	'name':'keyword.other.ts'
	}
	{
	'comment': 'Match <amd-module'
	'match': '(\\/\\/\\/\\s*<amd-module\\s*name\\s*=)(.*)(\\/>)'
	'captures':
	'1':
	'name':'keyword.other.ts'
	'2':
	'name':'amd.path.string'
	'3':
	'name':'keyword.other.ts'
	}
	{
	'comment': 'Match import = require'
	'match': '(import)\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)?\\s*=\\s*(require)\\s*\\((.*)\\)'
	'captures':
	'1':
	'name':'keyword.other.ts'
	'2':
	'name':'variable.type.ts'
	'3':
	'name':'keyword.other.ts'
	'4':
	'name':'require.path.string'
	}
	{
	'comment': 'Match ES6 "import from" syntax'
	'match': '(import).*(from)\\s*(.*[\'"])'
	'captures':
	'1':
	'name':'keyword.other.ts'
	'2':
	'name':'keyword.other.ts'
	'3':
	'name':'es6import.path.string'
	}

But I don't want to move .ts grammar over till everyone is happy with the token names in .tsx grammar (which we just pushed/released)

[stepancar]

@basarat,
as i understand you should commit your ts grammar changes
to tsx grammar too (for tsx highlighting)

[stepancar]

I've been meaning to be lazy and just let MS handle the grammar

&

I'm wondering, also, if someone could bring this into a common core for grammars in TypeScript to avoid this kind of duplicate work.

Did MS have plans to handle grammar?

[blakeembrey]

Did MS have plans to handle grammar?

Not that I know of, but we can always ask. If converting is as simple as a basic transform, then we can probably look at automating the custom patches and contributing syntax highlighting patches upstream instead - otherwise atom-typescript will continue diverging anyway.