vim-haml already included scss support

4 files changed, 12 insertions, 157 deletions

diff --git a/autoload/scss_indent.vim b/autoload/scss_indent.vim
deleted file mode 100644
index 2e57ab2c..00000000
--- a/autoload/scss_indent.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" usage:
-" set indentexpr=scss_indent#GetIndent(v:lnum)
-fun! scss_indent#GetIndent(lnum)
-  " { -> increase indent
-  " } -> decrease indent
-  if a:lnum == 1
-    " start at 0 indentation
-    return 0
-  endif
-
-  " try to find last line ending with { or }
-  " ignoring // comments
-  let regex = '\([{}]\)\%(\/\/.*\)\?$'
-  let nr = search(regex, 'bnW')
-  if nr > 0
-    let last = indent(nr)
-    let m = matchlist(getline(nr), regex)
-    let m_curr = matchlist(getline(a:lnum), regex)
-    echoe string(m).string(m_curr)
-    if !empty(m_curr) && m_curr[1] == '}' && m[1] == '{'
-      " last was open, current is close, use same indent
-      return last
-    elseif !empty(m_curr) && m_curr[1] == '}' && m[1] == '}'
-      " } line and last line was }: decrease
-      return last - &sw
-    endif
-    if m[1] == '{'
-      " line after {: increase indent
-      return last + &sw
-    else
-      " line after } or { - same indent
-      return last
-    endif
-  else
-    return 0
-  endif
-endfun
diff --git a/build b/build
index c58b3552..62f96801 100755
--- a/build
+++ b/build
@@ -80,7 +80,6 @@ PACKS="
   jimenezrick/vimerl
   tpope/vim-git
   skwp/vim-rspec
-  cakebaker/scss-syntax.vim
 "
 
 download "$PACKS"
diff --git a/ftdetect/scss.vim b/ftdetect/scss.vim
deleted file mode 100644
index 900752e5..00000000
--- a/ftdetect/scss.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufRead,BufNewFile *.scss	set filetype=scss.css
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 9bc849f8..6fb96915 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,126 +1,20 @@
 " Vim syntax file
-" Language: SCSS (Sassy CSS)
-" Author: Daniel Hofstetter (daniel.hofstetter@42dh.com)
-" Inspired by the syntax files for sass and css. Thanks to the authors of
-" those files!
+" Language:	SCSS
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Filenames:	*.scss
+" Last Change:	2010 Jul 26
 
-if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-    finish
-  endif
-  let main_syntax = 'scss'
+if exists("b:current_syntax")
+  finish
 endif
 
-runtime! syntax/css.vim
-runtime! syntax/css/*.vim
+runtime! syntax/sass.vim
 
-syn case ignore
+syn match scssComment "//.*" contains=sassTodo,@Spell
+syn region scssComment start="/\*" end="\*/" contains=sassTodo,@Spell
 
-syn region scssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,scssDefinition,scssComment,scssIdChar,scssClassChar,scssAmpersand,scssVariable,scssInclude,scssExtend,scssDebug,scssWarn,@scssControl,scssInterpolation,scssNestedSelector,scssReturn,scssFn
-
-syn region scssInterpolation start="#{" end="}" contains=scssVariable
-
-" functions from http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html
-syn region scssFn contained matchgroup=scssFnName start="\<\(rgb\|rgba\|red\|green\|blue\|mix\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(hsl\|hsla\|hue\|saturation\|lightness\|adjust-hue\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(lighten\|darken\|saturate\|desaturate\|grayscale\|complement\|invert\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(alpha\|opacity\|opacify\|transparentize\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(adjust-color\|scale-color\|change-color\|ie-hex-str\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(unquote\|quote\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(percentage\|round\|ceil\|floor\|abs\|min\|max\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(length\|nth\|join\|append\|zip\|index\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(type-of\|unit\|unitless\|comparable\)\s*(" end=")" oneline keepend
-syn region scssFn contained matchgroup=scssFnName start="\<\(if\)\s*(" end=")" oneline keepend
-
-syn match scssVariable "$[[:alnum:]_-]\+" nextgroup=scssVariableAssignment
-syn match scssVariableAssignment ":" contained nextgroup=scssVariableValue
-syn match scssVariableValue ".*;"me=e-1 contained contains=scssVariable,scssOperator,scssDefault "me=e-1 means that the last char of the pattern is not highlighted
-syn match scssMixin "^@mixin" nextgroup=scssMixinName
-syn match scssMixinName " [[:alnum:]_-]\+" contained nextgroup=scssDefinition
-syn match scssFunction "^@function" nextgroup=scssFunctionName
-syn match scssFunctionName " [[:alnum:]_-]\+" contained nextgroup=scssDefinition
-syn match scssReturn "@return" contained
-syn match scssInclude "@include" nextgroup=scssMixinName
-syn match scssExtend "@extend .*[;}]"me=e-1 contains=cssTagName,scssIdChar,scssClassChar
-syn keyword scssTodo TODO FIXME NOTE OPTIMIZE XXX contained containedIn=scssComment,cssComment
-
-syn match scssColor "#[0-9A-Fa-f]\{3\}\>" contained
-syn match scssColor "#[0-9A-Fa-f]\{6\}\>" contained
-
-syn match scssIdChar "#[[:alnum:]_-]\@=" nextgroup=scssId contains=scssColor
-syn match scssId "[[:alnum:]_-]\+" contained
-syn match scssClassChar "\.[[:alnum:]_-]\@=" nextgroup=scssClass
-syn match scssClass "[[:alnum:]_-]\+" contained
-syn match scssAmpersand "&" nextgroup=cssPseudoClass
-
-syn match scssOperator "+" contained
-syn match scssOperator "-" contained
-syn match scssOperator "/" contained
-syn match scssOperator "*" contained
-
-syn match scssNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,scssIdChar,scssClassChar,scssAmpersand,scssVariable,scssMixin,scssFunction,@scssControl,scssInterpolation,scssNestedProperty
-syn match scssNestedProperty "[[:alnum:]]\+:"me=e-1 contained
-
-syn match scssDebug "@debug"
-syn match scssWarn "@warn"
-syn match scssDefault "!default" contained
-
-syn match scssIf "@if"
-syn match scssElse "@else"
-syn match scssElseIf "@else if"
-syn match scssWhile "@while"
-syn match scssFor "@for" nextgroup=scssVariable
-syn match scssFrom " from "
-syn match scssTo " to "
-syn match scssThrough " through "
-syn match scssEach "@each" nextgroup=scssVariable
-syn match scssIn " in "
-syn cluster scssControl contains=scssIf,scssElse,scssElseIf,scssWhile,scssFor,scssFrom,scssTo,scssThrough,scssEach,scssIn
-
-syn match scssComment "//.*$" contains=@Spell
-syn region scssImportStr start="\"" end="\""
-syn region scssImport start="@import" end=";" contains=scssImportStr,scssComment,cssComment,cssUnicodeEscape,cssMediaType,cssUrl
-
-hi def link scssVariable  Identifier
-hi def link scssVariableValue Constant
-hi def link scssMixin     PreProc
-hi def link scssMixinName Function
-hi def link scssFunction  PreProc
-hi def link scssFunctionName Function
-hi def link scssFn        Constant
-hi def link scssFnName    Function
-hi def link scssReturn    Statement
-hi def link scssInclude   PreProc
-hi def link scssExtend    PreProc
-hi def link scssComment   Comment
-hi def link scssColor     Constant
-hi def link scssIdChar    Special
-hi def link scssClassChar Special
-hi def link scssId        Identifier
-hi def link scssClass     Identifier
-hi def link scssAmpersand Character
-hi def link scssNestedProperty Type
-hi def link scssDebug     Debug
-hi def link scssWarn      Debug
-hi def link scssDefault   Special
-hi def link scssIf        Conditional
-hi def link scssElse      Conditional
-hi def link scssElseIf    Conditional
-hi def link scssWhile     Repeat
-hi def link scssFor       Repeat
-hi def link scssFrom      Repeat
-hi def link scssTo        Repeat
-hi def link scssThrough   Repeat
-hi def link scssEach      Repeat
-hi def link scssIn        Repeat
-hi def link scssInterpolation Delimiter
-hi def link scssImport    Include
-hi def link scssImportStr Include
-hi def link scssTodo      Todo
+hi def link scssComment sassComment
 
 let b:current_syntax = "scss"
-if main_syntax == 'scss'
-  unlet main_syntax
-endif
+
+" vim:set sw=2: