use foldmethod=syntax by default w/ escape hatch

tklebanoff · Apr 10, 2021 · 5a1811c · 5a1811c
1 parent dab61ea
commit 5a1811c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/doc/elixir.txt b/doc/elixir.txt
@@ -102,6 +102,9 @@ SETTINGS					*elixir-settings*
 					*g:elixir_indent_max_lookbehind*
 	TODO
 
+					*g:elixir_fold*
+	TODO
+
 					*g:elixir_use_markdown_for_docs*
 	TODO
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -62,8 +62,7 @@ def syntax(content, pattern)
 
   def fold_and_replace(content, fold_on_line)
     with_file content do
-      cmd = ":set foldmethod=syntax<CR>"
-      cmd += "zO"
+      cmd = "zO"
       cmd += "#{fold_on_line}G"
       cmd += "zc"
       cmd += "cc#{FOLD_PLACEHOLDER}<Esc>"

diff --git a/syntax/elixir.vim b/syntax/elixir.vim
@@ -8,6 +8,11 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+" Default to enable folding; allow users to explicitly opt out
+if has("folding") && !(exists("g:elixir_fold") && !g:elixir_fold)
+  setlocal foldmethod=syntax
+endif
+
 syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@elixirDeclaration,elixirTodo,elixirArguments,elixirBlockDefinition,elixirUnusedVariable,elixirStructDelimiter,elixirListDelimiter
 syn cluster elixirRegexSpecial contains=elixirRegexEscape,elixirRegexCharClass,elixirRegexQuantifier,elixirRegexEscapePunctuation
 syn cluster elixirStringContained contains=elixirInterpolation,elixirRegexEscape,elixirRegexCharClass