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

Use atom's language-sass grammar for SASS and SCSS #4535

Merged
merged 2 commits into from
May 28, 2019
Merged

Use atom's language-sass grammar for SASS and SCSS #4535

merged 2 commits into from
May 28, 2019

Conversation

jonmast
Copy link
Contributor

@jonmast jonmast commented May 22, 2019

Switch to using https://github.com/atom/language-sass grammars for both SASS and SCSS languages.

Description

SCCS.tmbundle is badly out of date and no longer maintained. #2965 discussed switching to a different grammar, but it was never followed through.

This PR switches to language-sass instead since it's used by both atom and vscode, and should be better maintained in the future.

Errors

There were a couple of errors associated with this change:

  • The new sassdoc grammar references source.html which doesn't exist. Obviously we do have a grammar for HTML, I'm not sure if there's a way to have this use that?
  • The scss grammar is now source.css.scss instead of source.css, which is included in slim. I've reversed the alias in compiler/data.go which I think should address this, but it seems like the test scripts use a docker image locally so I'm not sure how to test it.

Checklist:

SCCS.tmbundle is badly out of date, use language-sass instead since it's
used by both atom and vscode, and should be better maintained in the
future.
@jonmast
Copy link
Contributor Author

jonmast commented May 22, 2019

Looks like CI is failing due to the license. It looks like it's just two MIT licenses concatenated together, but it gets detected as "other".

vendor/licenses/grammar/language-sass.txt Outdated Show resolved Hide resolved
Auto-detection didn't work on this one, @lildude reviewed and approved
it as MIT.
@lildude lildude self-requested a review May 28, 2019 15:42
@lildude lildude dismissed their stale review May 28, 2019 15:43

Manual license override has been done.

@lildude lildude requested review from pchaigno and Alhadis May 28, 2019 15:43
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.

Good idea.

@lildude lildude merged commit d4a975d 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

3 participants