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

Port over 9.18.1 changes #67

Merged
merged 2 commits into from Feb 3, 2020
Merged

Port over 9.18.1 changes #67

merged 2 commits into from Feb 3, 2020

Conversation

allejo
Copy link
Collaborator

@allejo allejo commented Feb 2, 2020

Closes #66

@allejo allejo merged commit a57c858 into master Feb 3, 2020
@allejo allejo deleted the feature/9.18.1-port branch February 3, 2020 02:19
@@ -1 +1 @@
{"aliases":["coffee","cson","iced"],"keywords":{"keyword":"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not","literal":"true false null undefined yes no on off","built_in":"npm require console print module global window document"},"illegal":"\\/\\*","contains":[{"className":"number","begin":"\\b(0b[01]+)","relevance":0},{"className":"number","begin":"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)","relevance":0,"starts":{"end":"(\\s*/)?","relevance":0}},{"className":"string","variants":[{"begin":"'''","end":"'''","contains":[{"begin":"\\\\[\\s\\S]","relevance":0}]},{"begin":"'","end":"'","contains":[{"$ref":"#contains.2.variants.0.contains.0"}]},{"begin":"\"\"\"","end":"\"\"\"","contains":[{"$ref":"#contains.2.variants.0.contains.0"},{"className":"subst","begin":"#\\{","end":"}","keywords":{"$ref":"#keywords"},"contains":[{"$ref":"#contains.0"},{"$ref":"#contains.1"},{"$ref":"#contains.2"},{"className":"regexp","variants":[{"begin":"///","end":"///","contains":[{"$ref":"#contains.2.variants.2.contains.1"},{"className":"comment","begin":"#","end":"$","contains":[{"begin":"\\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\\b"},{"className":"doctag","begin":"(?:TODO|FIXME|NOTE|BUG|XXX):","relevance":0}]}]},{"begin":"//[gim]*","relevance":0},{"begin":"\\/(?![ *])(\\\\\\/|.)*?\\/[gim]*(?=\\W)"}]},{"begin":"@[A-Za-z$_][0-9A-Za-z$_]*"},{"subLanguage":"javascript","excludeBegin":true,"excludeEnd":true,"variants":[{"begin":"```","end":"```"},{"begin":"`","end":"`"}]}]}]},{"begin":"\"","end":"\"","contains":[{"$ref":"#contains.2.variants.0.contains.0"},{"$ref":"#contains.2.variants.2.contains.1"}]}]},{"$ref":"#contains.2.variants.2.contains.1.contains.3"},{"$ref":"#contains.2.variants.2.contains.1.contains.4"},{"$ref":"#contains.2.variants.2.contains.1.contains.5"},{"className":"comment","begin":"###","end":"###","contains":[{"$ref":"#contains.2.variants.2.contains.1.contains.3.variants.0.contains.1.contains.0"},{"className":"doctag","begin":"(?:TODO|FIXME|NOTE|BUG|XXX):","relevance":0}]},{"$ref":"#contains.2.variants.2.contains.1.contains.3.variants.0.contains.1"},{"className":"function","begin":"^\\s*[A-Za-z$_][0-9A-Za-z$_]*\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>","end":"[-=]>","returnBegin":true,"contains":[{"className":"title","begin":"[A-Za-z$_][0-9A-Za-z$_]*","relevance":0},{"className":"params","begin":"\\([^\\(]","returnBegin":true,"contains":[{"begin":"\\(","end":"\\)","keywords":{"$ref":"#keywords"},"contains":["self",{"$ref":"#contains.0"},{"$ref":"#contains.1"},{"$ref":"#contains.2"},{"$ref":"#contains.2.variants.2.contains.1.contains.3"},{"$ref":"#contains.2.variants.2.contains.1.contains.4"},{"$ref":"#contains.2.variants.2.contains.1.contains.5"}]}]}]},{"begin":"[:\\(,=]\\s*","relevance":0,"contains":[{"className":"function","begin":"(\\(.*\\))?\\s*\\B[-=]>","end":"[-=]>","returnBegin":true,"contains":[{"$ref":"#contains.8.contains.1"}]}]},{"className":"class","beginKeywords":"class","end":"$","illegal":"[:=\"\\[\\]]","contains":[{"beginKeywords":"extends","endsWithParent":true,"illegal":"[:=\"\\[\\]]","contains":[{"$ref":"#contains.8.contains.0"}]},{"$ref":"#contains.8.contains.0"}]},{"begin":"[A-Za-z$_][0-9A-Za-z$_]*:","end":":","returnBegin":true,"returnEnd":true,"relevance":0}]}
{"aliases":["coffee","cson","iced"],"keywords":{"keyword":"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not","literal":"true false null undefined yes no on off","built_in":"npm require console print module global window document"},"illegal":"\\/\\*","contains":[{"className":"number","begin":"\\b(0b[01]+)","relevance":0},{"className":"number","begin":"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)","relevance":0,"starts":{"end":"(\\s*/)?","relevance":0}},{"className":"string","variants":[{"begin":"'''","end":"'''","contains":[{"begin":"\\\\[\\s\\S]","relevance":0}]},{"begin":"'","end":"'","contains":[{"$ref":"#contains.2.variants.0.contains.0"}]},{"begin":"\"\"\"","end":"\"\"\"","contains":[{"$ref":"#contains.2.variants.0.contains.0"},{"className":"subst","begin":"#\\{","end":"}","keywords":{"$ref":"#keywords"},"contains":[{"$ref":"#contains.0"},{"$ref":"#contains.1"},{"$ref":"#contains.2"},{"className":"regexp","variants":[{"begin":"///","end":"///","contains":[{"$ref":"#contains.2.variants.2.contains.1"},{"className":"comment","begin":"#","end":"$","contains":[{"begin":"\\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\\b"},{"className":"doctag","begin":"(?:TODO|FIXME|NOTE|BUG|XXX):","relevance":0}]}]},{"begin":"//[gim]{0,3}(?=\\W)","relevance":0},{"begin":"\\/(?![ *]).*?(?![\\\\]).\\/[gim]{0,3}(?=\\W)"}]},{"begin":"@[A-Za-z$_][0-9A-Za-z$_]*"},{"subLanguage":"javascript","excludeBegin":true,"excludeEnd":true,"variants":[{"begin":"```","end":"```"},{"begin":"`","end":"`"}]}]}]},{"begin":"\"","end":"\"","contains":[{"$ref":"#contains.2.variants.0.contains.0"},{"$ref":"#contains.2.variants.2.contains.1"}]}]},{"$ref":"#contains.2.variants.2.contains.1.contains.3"},{"$ref":"#contains.2.variants.2.contains.1.contains.4"},{"$ref":"#contains.2.variants.2.contains.1.contains.5"},{"className":"comment","begin":"###","end":"###","contains":[{"$ref":"#contains.2.variants.2.contains.1.contains.3.variants.0.contains.1.contains.0"},{"className":"doctag","begin":"(?:TODO|FIXME|NOTE|BUG|XXX):","relevance":0}]},{"$ref":"#contains.2.variants.2.contains.1.contains.3.variants.0.contains.1"},{"className":"function","begin":"^\\s*[A-Za-z$_][0-9A-Za-z$_]*\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>","end":"[-=]>","returnBegin":true,"contains":[{"className":"title","begin":"[A-Za-z$_][0-9A-Za-z$_]*","relevance":0},{"className":"params","begin":"\\([^\\(]","returnBegin":true,"contains":[{"begin":"\\(","end":"\\)","keywords":{"$ref":"#keywords"},"contains":["self",{"$ref":"#contains.0"},{"$ref":"#contains.1"},{"$ref":"#contains.2"},{"$ref":"#contains.2.variants.2.contains.1.contains.3"},{"$ref":"#contains.2.variants.2.contains.1.contains.4"},{"$ref":"#contains.2.variants.2.contains.1.contains.5"}]}]}]},{"begin":"[:\\(,=]\\s*","relevance":0,"contains":[{"className":"function","begin":"(\\(.*\\))?\\s*\\B[-=]>","end":"[-=]>","returnBegin":true,"contains":[{"$ref":"#contains.8.contains.1"}]}]},{"className":"class","beginKeywords":"class","end":"$","illegal":"[:=\"\\[\\]]","contains":[{"beginKeywords":"extends","endsWithParent":true,"illegal":"[:=\"\\[\\]]","contains":[{"$ref":"#contains.8.contains.0"}]},{"$ref":"#contains.8.contains.0"}]},{"begin":"[A-Za-z$_][0-9A-Za-z$_]*:","end":":","returnBegin":true,"returnEnd":true,"relevance":0}]}

Choose a reason for hiding this comment

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

Would there be any harm if this was prettified rather than a single line? :-) Would make it easier to see changes in diffs, etc.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No harm at all, just figured since they were generated the diffs weren't too important but it would be useful to see the changes from time to time.

Choose a reason for hiding this comment

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

Just a thought. :-)

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

Successfully merging this pull request may close these issues.

Freezing issue with coffeescript regex under some circumstances
2 participants