Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:adamstac/SCSS.tmbundle

  • Loading branch information...
commit eb9897ec8cdd4955b8cdbd24de18b1614ce8102d 2 parents a001a35 + 1cc691f
@adamstac authored
View
2  Commands/New Rule.tmCommand
@@ -13,7 +13,7 @@ line.strip!
snippet = <<-EOM
<space>${1:selector} {${0}
-<space>} //${1}
+<space>}
EOM
snippet.gsub!(/\<space\>/, space)
View
0  Macros/:: new line.tmMacro → Macros/%3A%3A new line.tmMacro
File renamed without changes
View
2  Preferences/completions.tmPreferences
@@ -5,7 +5,7 @@
<key>name</key>
<string>completions</string>
<key>scope</key>
- <string>source.css -meta.property-list</string>
+ <string>source.scss -meta.property-list</string>
<key>settings</key>
<dict>
<key>completions</key>
View
2  Snippets/Divisor.tmSnippet
@@ -4,7 +4,7 @@
<dict>
<key>content</key>
<string>// $1
-// ----------------------------------------</string>
+// -----------------------------------------------------------------</string>
<key>keyEquivalent</key>
<string>~@/</string>
<key>name</key>
View
16 Syntaxes/SCSS.tmLanguage
@@ -119,6 +119,12 @@
<key>name</key>
<string>meta.at-rule.mixin.scss</string>
</dict>
+ <dict>
+ <key>match</key>
+ <string>\}\s+</string>
+ <key>name</key>
+ <string>punctuation.definition.end</string>
+ </dict>
</array>
<key>repository</key>
<dict>
@@ -817,7 +823,7 @@
<array>
<dict>
<key>include</key>
- <string>#misin_params</string>
+ <string>#mixin_params</string>
</dict>
<dict>
<key>include</key>
@@ -923,16 +929,16 @@
<dict>
<key>begin</key>
<string>\{</string>
- <key>captures</key>
+ <key>end</key>
+ <string>\}\s+</string>
+ <key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
- <string>punctuation.section.property-list.css</string>
+ <string>punctuation.definition.end</string>
</dict>
</dict>
- <key>end</key>
- <string>\}</string>
<key>name</key>
<string>meta.property-list.css</string>
<key>patterns</key>
View
8 Syntaxes/source.textmate
@@ -36,6 +36,10 @@
3 = { name = 'entity.name.function.scss'; };
};
},
+ {
+ name = 'punctuation.definition.end';
+ match = "\}";
+ },
);
comment = 'The Magic happens here. Rewrite by Mario "Kuroir" Ricalde';
repository = {
@@ -203,7 +207,7 @@
property_list = { name = 'meta.property-list.css';
begin = '\{';
end = '\}';
- captures = { 0 = { name = 'punctuation.section.property-list.css'; }; };
+ endCaptures = { 0 = { name = 'punctuation.definition.end'; }; };
patterns = (
{ include = '#flow_control'; },
{ include = '#rules'; },
@@ -604,7 +608,7 @@
mixin = {
comment = 'Include the Mixin variants';
patterns = (
- { include = '#misin_params'; },
+ { include = '#mixin_params'; },
{ include = '#mixin_solo'; },
);
};
Please sign in to comment.
Something went wrong with that request. Please try again.