From cac9d806f05178c642ce27aa4dfa9763b1afea4c Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Fri, 10 Aug 2018 03:59:36 -0400 Subject: [PATCH] Limit Sass 'iskeyword' override to pure Sass files --- ftplugin/sass.vim | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim index 0b43a2d..f0c35f2 100644 --- a/ftplugin/sass.vim +++ b/ftplugin/sass.vim @@ -9,16 +9,19 @@ if exists("b:did_ftplugin") endif let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl com< cms< def< inc< inex< isk< ofu< sua<" +let b:undo_ftplugin = "setl com< cms< def< inc< inex< ofu< sua<" setlocal comments=:// setlocal commentstring=//\ %s setlocal includeexpr=SassIncludeExpr(v:fname) -setlocal iskeyword+=- -setlocal iskeyword+=$ -setlocal iskeyword+=% setlocal omnifunc=csscomplete#CompleteCSS setlocal suffixesadd=.sass,.scss,.css +if &filetype =~# '\' + setlocal iskeyword+=- + setlocal iskeyword+=$ + setlocal iskeyword+=% + let b:undo_ftplugin .= ' isk<' +endif let &l:define = '^\C\v\s*%(\@function|\@mixin|\=)|^\s*%(\$[[:alnum:]-]+:|[%.][:alnum:]-]+\s*%(\{|$))@=' let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='