These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
The file JavaScript.tmLanguage.json is derived from TypeScriptReact.tmLanguage.
To update to the latest version:
cd extensions/typescriptand runnpm run update-grammars- don't forget to run the integration tests at
./scripts/test-integration.sh
The script does the following changes:
- fileTypes .tsx -> .js & .jsx
- scopeName scope.tsx -> scope.js
- update all rule names .tsx -> .js