Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split TSX from TypeScript to fix #4359 #4511

Merged
merged 3 commits into from
May 10, 2019
Merged

Split TSX from TypeScript to fix #4359 #4511

merged 3 commits into from
May 10, 2019

Conversation

Alhadis
Copy link
Collaborator

@Alhadis Alhadis commented Apr 29, 2019

This fixes the syntax highlighting errors with TSX (TypeScript with JSX/React), as described in #4359.

Note the tests are failing because of the classifier's sudden confusion between JavaScript/TypeScript… caused by node being listed as an interpreter for both. The separation of the TSX fixtures were obviously screwing with it.

Merging #4470 will fix this; I merged both of my branches locally, and the tests passed. So get #4470 looked at before tending to this. =)

Template removed as it doesn't really apply.

@lildude
Copy link
Member

lildude commented May 10, 2019

You got conflicts Sir 🎩

@Alhadis
Copy link
Collaborator Author

Alhadis commented May 10, 2019

TSX and TSQL happened to fall RIGHT on top of each other. 😂 What were the odds.

Conflicts fixed!

Copy link
Contributor

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Alhadis Alhadis merged commit 83e25b2 into master May 10, 2019
@Alhadis Alhadis deleted the tsx branch May 10, 2019 11:22
@github-linguist github-linguist locked as resolved and limited conversation to collaborators Jun 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants