-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Structured text language support #2310
Conversation
I've solved conflicts. But that does not look intuitive. I thought the build process can run npx gulp and generate those files. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @Serhioromano for this PR!
I left you a few comments with things to improve.
And please fix the indentation of your language definition and test files. We only use tabs.
Regarding the merge conflict:
Seems like you fork wasn't up to date. To fix this:
- Update your fork and merge these changes into this branch
- Revert all changes you made to
prism-show-language.js
- Run
npx gulp
Co-Authored-By: Michael Schmidt <[email protected]>
Co-Authored-By: Michael Schmidt <[email protected]>
Co-Authored-By: Michael Schmidt <[email protected]>
Co-Authored-By: Michael Schmidt <[email protected]>
Co-Authored-By: Michael Schmidt <[email protected]>
I do not know why checks fail. It does work for local when I run npm run test**** |
What is
|
By reading your messages I applied some changes. I didn't know where to see those messages. |
return; | ||
} | ||
|
||
if (!Prism.plugins.toolbar) { | ||
console.warn('Show Languages plugin loaded before Toolbar plugin.'); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert these changes. While the file might need a cleanup, it shouldn't be part of this PR.
The only change to this file should be this:
"ichigojam": "IchigoJam",
+ "iecst": "Structured Text (IEC 61131-3)",
"inform7": "Inform 7",
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How? when I run npx gulp it rebuild this file and make them all one line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And yet, I am not sure how to revert a single file change. Out of my knowledge. I'll try to google it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The easiest way would probably to copy-paste the content of the current prism-show-language.js
in master and run npx gulp
.
There's probably also some fancy git-way of doing it, but I'm not a git expert...
This only checks your language against your
What I showed you was the build log of Travis CI. To see this, click on the red X behind a commit on GitHub, click Details, choose any red (failed) build job, scroll waaaaay down. |
I'll create a new PR. This copy of prism was forked years ago and propbably rebase did not work well. |
New PR: #2311 |
As discussed in #1923 here is PR