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.

Sign up for GitHub

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

Jump to bottom

Add Factor #2203

Merged
merged 17 commits into from
Feb 16, 2020
Merged

Add Factor #2203

merged 17 commits into from
Feb 16, 2020

Conversation

catb0t
Copy link
Contributor

@catb0t catb0t commented Feb 8, 2020 •
edited

Factor language

Example

Screenshot from 2020-02-07 21-36-43

@catb0t catb0t changed the title Factor: add language definition, examples and tests Add Factor Feb 8, 2020
@catb0t catb0t force-pushed the factor branch 3 times, most recently from 848b923 to 028a9dd Compare February 8, 2020 12:36
RunDevelopment
RunDevelopment requested changes Feb 9, 2020
View reviewed changes
Copy link
Member

@RunDevelopment RunDevelopment left a comment

Choose a reason for hiding this comment

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

Thank you @catb0t for making this language definition!

I left you a few comments on how to further improve the language definition and other minor things.

Also, please don't force-push if possible. It prevents me and others from seeing what changed. We will squash and merge at the end, so make as many commits as you like.

components/prism-factor.js Outdated Show resolved Hide resolved
components.json Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
@catb0t
Copy link
Contributor Author

catb0t commented Feb 9, 2020

So many upstream projects insist that contributors squash before they will merge/rebase, I forget that anyone does differently. I would rather not force-push too.

@catb0t
Copy link
Contributor Author

catb0t commented Feb 10, 2020 •
edited

This should be ready for merge, unless there's other changes needed.

@catb0t
Factor: add language definition, examples and tests
192feb4
@catb0t
fixes and changes from on RunDevelopment
bbd8104
@catb0t
fix bugs and add more tests thanks to RunDevelopment
6139d96
@catb0t
tabs may not immediately follow the ! starting a comment, but they ma…
bc5097d 
…y appear after the "! " space character
@catb0t
lookahead instead of classes for conventionally-named-word
cd2b206
@catb0t
strings tests
a1d8829
@catb0t
string inside
a7450fc
@catb0t
string / comment extensions: no tests yet
1d21cc5
@catb0t
factor: support new comments and literals
2f0947e 
- 'regexp' vocabulary syntax support for R/ <regexp>/
- 'multiline' vocab syntax support:
	- ![[ ]] and ![==[ ]==] comments
	- /* C-like comments */
	- [[ ]] and [==[ ]==] strings
	- HEREDOC: marker ... marker and STRING: name ... ;
- string improvements
- 'inside' highlighting improvements
@catb0t
improve the multiline ![=...[ ]=...] and [=...[ ]=...] regexes
9e5ff28
@catb0t
whitespace
43d0755
@catb0t
Copy link
Contributor Author

catb0t commented Feb 15, 2020

(Sorry for force-push, fixing components.js merge conflict)

RunDevelopment
RunDevelopment requested changes Feb 15, 2020
View reviewed changes
Copy link
Member

@RunDevelopment RunDevelopment left a comment

Choose a reason for hiding this comment

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

Wow. Lots of changes.

components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
components/prism-factor.js Outdated Show resolved Hide resolved
@catb0t
Copy link
Contributor Author

catb0t commented Feb 16, 2020 •
edited

I forgot about regexp flags until now. That's the last change I wanted to get in, so I'm done adding commits (except bugfixes, lol) unless you request further changes.

RunDevelopment
RunDevelopment requested changes Feb 16, 2020
View reviewed changes
Copy link
Member

@RunDevelopment RunDevelopment left a comment

Choose a reason for hiding this comment

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

A few minor nits but apart from that, I think it's ready to go.

(Also, please rebuild. That's why the build fails.)

components/prism-factor.js Outdated Show resolved Hide resolved
examples/prism-factor.html Outdated Show resolved Hide resolved
tests/languages/factor/other_builtin_parsing_words_feature.test Outdated Show resolved Hide resolved
tests/languages/factor/strings_feature.test Outdated Show resolved Hide resolved
@RunDevelopment RunDevelopment merged commit f941102 into PrismJS:master Feb 16, 2020
@RunDevelopment
Copy link
Member

Thank you for contributing @catb0t!

@catb0t
Copy link
Contributor Author

catb0t commented Feb 16, 2020

Thank you for your incredible patience, and also universal knowledge of regex, @RunDevelopment!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RunDevelopment RunDevelopment RunDevelopment approved these changes

Assignees
No one assigned
Labels
language-definitions needs changes new language
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@catb0t @RunDevelopment