fix broken highlighting for properties sharing selector names

[dsifford]

Hi there,

This PR addresses a small issue in the scss grammar that caused property names that match selector names to be highlighted incorrectly.

The fix simply involved switching the order of the includes.

The bug can be reproduced using the current grammar by typing this into a scss file...

.foo {
  color: red; // no issue
  font: 'Helvetica'; // issue
  cursor: pointer; // issue
  content: ''; // issue
}

Let me know if you need anything else. Thanks so much 😄

Edit:

Fixes #226

[winstliu]

Thanks so much for the PR @dsifford! Can you take a look at the failing specs? Hopefully those can be fixed easily as well.

Please tell me if you need any help running specs.

[dsifford]

Yep, looking at them now. 😄

Looks like it should be fairly straightforward to fix as well.

Is there any way to run these tests locally? I plan on hammering out a ton of random bugs in various languages throughout atom as time allows so any tips you might have on my first contribution are greatly encouraged and appreciated!

[winstliu]

Is there any way to run these tests locally?

atom --test spec. To only run specific tests, add an f in front of them: fdescribe, fit. You can focus multiple tests.

I plan on hammering out a ton of random bugs in various languages throughout atom as time allows

❤️ 😍 ❤️ It'll be nice having some help!

[dsifford]

Aha, so the test runner is built into atom itself. How fancy!

Thanks for the help. Busy for the rest of the night, but I'll try to circle back to this tomorrow or the next day 👍

[dsifford]

@50Wliu I think I got it 👍

Edit: Just realized I neglected to add tests for the changes. I'll do that tomorrow afternoon.

[dsifford]

Good to go

[winstliu]

Yay! Would you mind taking a look at language-less next, which has the same problem? I'll try to review this shortly.

[dsifford]

I'm on it!