Merge branch 'master' into st4107

README.md

@@ -22,20 +22,23 @@ The easiest way to install is using [Package Control](https://packagecontrol.io)
 
 SCSS extends Sublime Text's CSS syntax definition as of ST4149.
 
-If SCSS syntax highlighting doesn't work and console displays syntax errors, please make sure to remove any out-dated syntax override.
+If SCSS syntax highlighting doesn't work and console displays syntax errors, 
 
-Steps:
+1. check if CSS package enabled.
+2. remove any out-dated syntax override.
+
+### Enable CSS package
+
+1. Open `Command Palette` using <kbd>ctrl+shift+P</kbd> or menu item `Tools → Command Palette...`
+2. Choose `Package Control: Enable Packages`
+3. Find `CSS` and hit <kbd>Enter</kbd>
+
+### Remove overrides
 
 1. call _Menu > Preferences > Browse Packages.._
 2. Look for _CSS_ folder
 3. Remove it or at least delete any _CSS.sublime-syntax_ in it
 
-## Buy me a coffee
-
-☕️👌🏻
-
-If you enjoy this package, feel free to make a little [donation via PayPal](https://paypal.me/koenlageveen) towards the coffee that keeps this project running. It's much appreciated!
-
 ## Notes
 
 Development on the Sass syntax is currently frozen. It's too high maintenance since it's so different from CSS. Furthermore, the Sass language doesn't support various features that SCSS does: it's not left behind by the Sass team per se, but SCSS is the primary language right now. 

Syntaxes/SCSS.sublime-settings

@@ -4,7 +4,7 @@
 
     // Controls what scopes default completions will be provided in.
     // Can be a list of strings which are joined before matching.
-    "default_completions_selector": "source.scss - meta.selector",
+    "default_completions_selector": "source.scss",
 
     // Default separators except `-`
     "word_separators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?",

Syntaxes/Sass.sublime-settings

@@ -4,7 +4,7 @@
 
     // Controls what scopes default completions will be provided in.
     // Can be a list of strings which are joined before matching.
-    "default_completions_selector": "source.sass - meta.selector",
+    "default_completions_selector": "source.sass",
 
     // Default separators except `-`
     "word_separators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?",

plugins/completions/provider.py

@@ -234,10 +234,8 @@ def on_query_completions(self, view, prefix, locations):
             items = self.complete_function_argument(view, prefix, pt)
         elif view.match_selector(pt - 1, "meta.property-value, punctuation.separator.key-value"):
             items = self.complete_property_value(view, prefix, pt, True)
-        elif view.match_selector(pt - 1, "meta.property-name, meta.property-list - meta.selector"):
-            items = self.complete_property_name(view, prefix, pt, True)
         else:
-            items = None
+            items = self.complete_property_name(view, prefix, pt, True)
 
         if items:
             return sublime.CompletionList(items)