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

Added Motorola 68K Grammar #4439

Merged
merged 4 commits into from
May 28, 2019
Merged

Added Motorola 68K Grammar #4439

merged 4 commits into from
May 28, 2019

Conversation

joshumax
Copy link
Contributor

@joshumax joshumax commented Feb 28, 2019

This commit adds Motorola 68K assembly support to linguist.

Checklist:

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.

Thanks for the contribution!

I left a couple comments below we'll need to adress

lib/linguist/languages.yml Outdated Show resolved Hide resolved
samples/Motorola 68K Assembly/basic.X68 Outdated Show resolved Hide resolved
grammars.yml Outdated Show resolved Hide resolved
@joshumax
Copy link
Contributor Author

joshumax commented Feb 28, 2019

@pchaigno Thank you for your feedback! These problems have been fixed.

@joshumax joshumax closed this Feb 28, 2019
@joshumax joshumax reopened this Feb 28, 2019
@pchaigno pchaigno requested a review from lildude April 4, 2019 12:04
- ".X68"
tm_scope: source.m68k
ace_mode: assembly_x86
language_id: 477582706
Copy link
Member

Choose a reason for hiding this comment

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

I note you've not picked a colour for this language. That's not a problem as we'll fall back to the default of #cccccc but I wanted to check if this is intentional.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's part of a group so it won't get a color anyway, no?

Copy link
Member

Choose a reason for hiding this comment

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

Doh!! Of course. I completely missed that. Thanks @pchaigno

@lildude
Copy link
Member

lildude commented Apr 4, 2019

@joshumax can you please resolve the merge conflict.

@joshumax
Copy link
Contributor Author

joshumax commented Apr 6, 2019

@lildude @pchaigno The merge conflict has been resolved.

@lildude
Copy link
Member

lildude commented Apr 6, 2019

Thanks. The test failure needs to be addressed now:

  1) Failure:
TestGrammars#test_readme_file_is_in_sync [/home/travis/build/github/linguist/test/test_grammars.rb:42]:
Grammar list is out-of-date. Run `script/list-grammars`.
--- expected
+++ actual
@@ -242,11 +242,6 @@
 - **Monkey:** [gingerbeardman/monkey.tmbundle](https://github.com/gingerbeardman/monkey.tmbundle)
 - **MoonScript:** [leafo/moonscript-tmbundle](https://github.com/leafo/moonscript-tmbundle)
 - **Motorola 68K Assembly:** [zerkman/language-m68k](https://github.com/zerkman/language-m68k)
-- **MQL4:** [mqsoft/MQL5-sublime](https://github.com/mqsoft/MQL5-sublime)
-- **MQL5:** [mqsoft/MQL5-sublime](https://github.com/mqsoft/MQL5-sublime)
-- **MTML:** [atom/language-html](https://github.com/atom/language-html)
-- **mupad:** [ccreutzig/sublime-MuPAD](https://github.com/ccreutzig/sublime-MuPAD)
-- **nanorc:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
 - **NCL:** [rpavlick/language-ncl](https://github.com/rpavlick/language-ncl)
 - **NSIS:** [github-linguist/NSIS](https://github.com/github-linguist/NSIS)
 - **Nearley:** [Hardmath123/sublime-nearley](https://github.com/Hardmath123/sublime-nearley)

@stale
Copy link

stale bot commented May 6, 2019

This pull request has been automatically marked as stale because it has not had recent activity, and will be closed if no further activity occurs. If this pull request was overlooked, forgotten, or should remain open for any other reason, please reply here to call attention to it and remove the stale status. Thank you for your contributions.

@stale stale bot added the Stale label May 6, 2019
@lildude
Copy link
Member

lildude commented May 10, 2019

@joshumax nudge

@stale stale bot removed the Stale label May 10, 2019
@joshumax
Copy link
Contributor Author

@lildude Whoops, looks like I missed the few messages above and it went stale. I'll push it up!

vendor/README.md Outdated
@@ -247,6 +247,12 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **Modula-3:** [newgrammars/m3](https://github.com/newgrammars/m3)
- **Monkey:** [gingerbeardman/monkey.tmbundle](https://github.com/gingerbeardman/monkey.tmbundle)
- **MoonScript:** [leafo/moonscript-tmbundle](https://github.com/leafo/moonscript-tmbundle)
- **Motorola 68K Assembly:** [zerkman/language-m68k](https://github.com/zerkman/language-m68k)
- **MQL4:** [mqsoft/MQL5-sublime](https://github.com/mqsoft/MQL5-sublime)
Copy link
Member

Choose a reason for hiding this comment

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

This line and the 4 below it are what is causing the test to fail. They need to be removed from this PR.

Copy link
Member

@lildude lildude left a comment

Choose a reason for hiding this comment

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

See my last change about what needs to be fixed so we can merge this.

@Alhadis
Copy link
Collaborator

Alhadis commented May 17, 2019

@joshumax Just run script/list-grammars locally to regenerate the grammars list.

@Alhadis Alhadis dismissed lildude’s stale review May 21, 2019 16:34

Updated branch with the requested changes.

Copy link
Collaborator

@Alhadis Alhadis left a comment

Choose a reason for hiding this comment

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

CI's green now, @lildude. I fixed the outdated grammar-list myself. 👍 Should be good to merge.

@lildude lildude merged commit fd73729 into github-linguist:master May 28, 2019
@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

4 participants