Add configs for vim svelte dev

bin/switch_wallpaper.sh

@@ -1,2 +1,2 @@
 #!/bin/env bash
-feh --bg-scale --randomize ~/Dropbox/Wallpapers/Pack1
+feh --bg-scale --randomize /mnt/photos/Wallpapers/ArchVM/

config/nvim/config/init.vimrc

@@ -126,16 +126,14 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
 " Allows vim to configure filetype by file section (for svelte)
 Plug 'Shougo/context_filetype.vim'
 " Prettier
-Plug 'prettier/vim-prettier', { 'do': 'npm install' }
+Plug 'prettier/vim-prettier', {
+  \ 'do': 'npm install',
+  \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'svelte', 'yaml', 'html'] }
 
 " - Web -
 Plug 'mattn/emmet-vim'
 Plug 'mattn/webapi-vim'
-Plug 'evanleck/vim-svelte'
-Plug 'coc-extensions/coc-svelte'
-" TODO: Needs to be installed with `:CocInstall coc-tsserver`, figure out how
-" to config this
-" Plug 'coc-extensions/coc-tsserver'
+Plug 'cakebaker/scss-syntax.vim'
 
 " - Python -
 " Plug 'klen/python-mode'
@@ -154,8 +152,17 @@ Plug 'zchee/deoplete-jedi'
 
 " - Javascript -
 Plug 'pangloss/vim-javascript'
-" Typescript
+
+" - Typescript -
 Plug 'HerringtonDarkholme/yats.vim'
+" TODO: Needs to be installed with `:CocInstall coc-tsserver`, figure out how
+" to config this
+" Plug 'coc-extensions/coc-tsserver'
+
+" - Svelte
+" Plug 'evanleck/vim-svelte', {'branch': 'main'}
+Plug 'leafOfTree/vim-svelte-plugin'
+Plug 'coc-extensions/coc-svelte'
 
 " - Processing -
 Plug 'sophacles/vim-processing'

config/nvim/config/plugin.vimrc

@@ -77,38 +77,6 @@ let g:gitgutter_map_keys = 0
 " NERD Commenter
 " let g:NERDMenuMode = 1
 
-" For context_filetype
-let g:NERDSpaceDelims = 1
-let g:NERDCompactSexyComs = 1
-let g:NERDCustomDelimiters = { 'html': { 'left': '' } }
-
-" Align comment delimiters to the left instead of following code indentation
-let g:NERDDefaultAlign = 'left'
-
-fu! NERDCommenter_before()
-  if (&ft == 'html') || (&ft == 'svelte')
-    let g:ft = &ft
-    let cfts = context_filetype#get_filetypes()
-    if len(cfts) > 0
-      if cfts[0] == 'svelte'
-        let cft = 'html'
-      elseif cfts[0] == 'scss'
-        let cft = 'css'
-      else
-        let cft = cfts[0]
-      endif
-      exe 'setf ' . cft
-    endif
-  endif
-endfu
-
-fu! NERDCommenter_after()
-  if (g:ft == 'html') || (g:ft == 'svelte')
-    exec 'setf ' . g:ft
-    let g:ft = ''
-  endif
-endfu
-
 " NERD Tree
 augroup DIRCHAANGE
     au!
@@ -177,23 +145,66 @@ let g:polyglot_disabled = ['python']
 set updatetime=300
 set shortmess+=c " don't give |ins-completion-menu| messages.
 
+" - Svelte -
+let g:svelte_preprocessor_tags = [
+\   { 'name': "ts", 'tag': "script", 'as': "typescript" }
+\ ]
+let g:svelte_preprocessors = ["scss", "sass", "typescript", "ts"]
+let g:vim_svelte_plugin_load_full_syntax = 1
+let g:vim_svelte_plugin_use_sass = 1
+let g:vim_svelte_plugin_use_typescript = 1
+let g:vim_svelte_plugin_use_foldexpr = 0
+
 if !exists('g:context_filetype#same_filetypes')
   let g:context_filetype#filetypes = {}
 endif
 
-" TODO: The problem here isn't matching typescript, it's that typescript
-" doesn't syntax highlight correctly
 let g:context_filetype#filetypes.svelte =
 \ [
+\   {'filetype' : 'typescript', 'start': '<script\%( [^>]*\)\? \%(ts\|lang="\%(ts\|typescript\)"\)\%( [^>]*\)\?>', 'end': '</script>'},
 \   {'filetype' : 'javascript', 'start' : '<script \?.*>', 'end' : '</script>'},
-\   {'filetype' : 'typescript', 'start': '<script\%( [^>]*\)\? \%(ts\|lang="\%(ts\|typescript\)"\)\%( [^>]*\)\?>', 'end': ''},
-\   {'filetype' : 'scss', 'start' : '<style \?.*lang="scss">', 'end' : '</style>'},
+\   {'filetype' : 'scss', 'start' : '<style \?.*lang=''scss''>', 'end' : '</style>'},
 \   {'filetype' : 'sass', 'start' : '<style \?.*lang="sass">', 'end' : '</style>'},
 \   {'filetype' : 'css', 'start' : '<style \?.*>', 'end' : '</style>'},
 \ ]
 
 let g:ft = ''
 
+" For NERDCommenter
+let g:NERDSpaceDelims = 1
+" let g:NERDCompactSexyComs = 1
+
+fu! NERDCommenter_before()
+  if (&ft == 'html') || (&ft == 'svelte')
+    let g:ft = &ft
+    let cfts = context_filetype#get_filetypes()
+    if len(cfts) > 0
+      if cfts[0] == 'svelte'
+        let cft = 'html'
+      else
+        let cft = cfts[0]
+      endif
+      echo "Using filetype=".cft." for comment"
+      exe 'setf '.cft
+      if exists('b:NERDCommenterDelims')
+        unlet b:NERDCommenterDelims
+      endif
+      call nerdcommenter#SetUp()
+    endif
+  endif
+endfu
+
+fu! NERDCommenter_after()
+  if g:ft == 'svelte'
+    exec 'setf '.g:ft
+    if exists('b:NERDCommenterDelims')
+      unlet b:NERDCommenterDelims
+    endif
+    call nerdcommenter#SetUp()
+    let g:ft = ''
+  endif
+endfu
+
 " Prettier
 let g:prettier#quickfix_enabled = 0
 let g:prettier#autoformat_require_pragma = 0