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

Add support for Idris #2755

Merged
merged 6 commits into from Feb 23, 2021
Merged

Add support for Idris #2755

merged 6 commits into from Feb 23, 2021

Conversation

@KeenS
Copy link
Contributor

@KeenS KeenS commented Feb 11, 2021

This adds support for Idris

@github-actions
Copy link

@github-actions github-actions bot commented Feb 11, 2021

JS File Size Changes (gzipped)

A total of 3 files have changed, with a combined diff of +399 B (+9.0%).

file master pull size diff % diff
components/prism-idris.min.js 0 Bytes 377 B +377 B +100.0%
plugins/autoloader/prism-autoloader.min.js 2.19 KB 2.21 KB +12 B +0.5%
plugins/show-language/prism-show-language.min.js 2.24 KB 2.25 KB +10 B +0.4%

Generated by 🚫 dangerJS against 2f05bfc

Copy link
Member

@RunDevelopment RunDevelopment left a comment

Thank you for this PR @KeenS!

It seems like you based Idris on our Haskell language definition. Instead of copying the regexes, please the Prism.languages.extend instead.

components.json Outdated Show resolved Hide resolved
@RunDevelopment
Copy link
Member

@RunDevelopment RunDevelopment commented Feb 11, 2021

Also, please do not modify package-lock.json. This the reason the CI fails.

Please revert your changes to package-lock.json, delete your local node_modules directory, and reinstall Prism's dependencies using npm ci. Rebuild Prism and commit all changes. The CI should then pass.

@RunDevelopment
Copy link
Member

@RunDevelopment RunDevelopment commented Feb 11, 2021

@KeenS Please revert all changes to package-lock.json or else we can't merge this.

@KeenS KeenS force-pushed the language-idris branch from 9fc0229 to e6a005d Feb 12, 2021
@KeenS
Copy link
Contributor Author

@KeenS KeenS commented Feb 12, 2021

Sorry, I was careless. I removed the change to package-lock.json from git history and replaced spaces with tabs.

Though I don't think extending language syntax is a good way (changing Haskell syntax shouldn't affect Idris'), I followed your advice

@KeenS KeenS requested a review from RunDevelopment Feb 12, 2021
@RunDevelopment RunDevelopment linked an issue that may be closed by this pull request Feb 12, 2021
components.json Outdated Show resolved Hide resolved
Co-authored-by: Michael Schmidt <mitchi5000.ms@googlemail.com>
@RunDevelopment
Copy link
Member

@RunDevelopment RunDevelopment commented Feb 13, 2021

Please rebuild to make the CI pass.

You also need to resolve the merge conflict. Since all conflicting files are generated ones, it should be enough to merge master and then rebuild to resolve the conflicts.

@RunDevelopment RunDevelopment merged commit e931441 into PrismJS:master Feb 23, 2021
8 checks passed
@RunDevelopment
Copy link
Member

@RunDevelopment RunDevelopment commented Feb 23, 2021

Thank you for contributing @KeenS!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants