Changeset 3750 for lang/vim/narrow/trunk

Timestamp:

12/29/07 08:25:57 (11 months ago)

Author:

kana

Message:

lang/vim/narrow:
* Fix :Narrow and :Widen not to use temporary files. Now :Widen correctly

works even if the target buffer is :Narrow'ed by two or more Vim processes.

* Modify :Narrow to zz after narrowing for visibility.
* Modify :Narrow to include all lines of closed folds in [range].

Location:

lang/vim/narrow/trunk

Files:

• autoload/narrow.vim (modified) (5 diffs)
• doc/narrow.txt (modified) (3 diffs)
• plugin/narrow.vim (modified) (1 diff)

lang/vim/narrow/trunk/autoload/narrow.vim

@@ -1 +1 @@
 " narrow - Emulate Emacs' narrowing feature
-" Version: 0.1
+" Version: 0.2
 " Copyright (C) 2007 kana <http://nicht.s8.xrea.com/>
 " License: MIT license (see <http://www.opensource.org/licenses/mit-license>)
@@ -19 +19 @@
   endif
 
+  let line1 = s:normalize_line(a:line1, 'head')
+  let line2 = s:normalize_line(a:line2, 'tail')
+
   setlocal foldenable
   setlocal foldmethod=manual
   setlocal foldtext=''
-  call s:adjust_cursor_if_invoked_via_visual_mode(a:line1, a:line2)
+  call s:adjust_cursor_if_invoked_via_visual_mode(line1, line2)
   let pos = getpos('.')
     call s:clear_all_folds()
-    call s:fold_before(a:line1)
-    call s:fold_after(a:line2)
+    call s:fold_before(line1)
+    call s:fold_after(line2)
   call setpos('.', pos)
+  normal! zz
   return 1
 endfunction
@@ -77 +81 @@
 
 
+function! s:normalize_line(line, mode)  "{{{2
+  " Return the first/last line number of a closed fold if a:line is contained
+  " the fold, otherwise return a:line as is.
+  let pline = (a:mode ==# 'head' ? foldclosed(a:line) : foldclosedend(a:line))
+  return 0 < pline ? pline : a:line
+endfunction
+
+
+
+
 function! s:fold_before(line)  "{{{2
   if 1 < a:line
@@ -106 +120 @@
 
 
-" view options  "{{{2
-function! s:set_view_options()
-  let s:original_viewdir = &viewdir
-  let &viewdir = s:original_viewdir . '/narrow'
-  let s:original_viewoptions = &viewoptions
-  let &viewoptions = 'folds'
-endfunction
-
-function! s:restore_view_options()
-  let &viewdir = s:original_viewdir
-  let &viewoptions = s:original_viewoptions
-endfunction
-
-
-
-
 function! s:save_the_state_of_buffer()  "{{{2
-  call s:set_view_options()
-    " BUGS: :mkview doesn't create intermediate directories.
-    if !isdirectory(&viewdir)
-      call mkdir(&viewdir, 'p', 0700)
-    endif
-    " BUGS: :mkview doesn't save folds info when &l:buftype isn't ''.
-    let original_buftype = &l:buftype
-    let &l:buftype = ''
-      mkview
-    let &l:buftype = original_buftype
-  call s:restore_view_options()
-
   let original_state = {}
   let original_state.foldenable = &l:foldenable
   let original_state.foldmethod = &l:foldmethod
   let original_state.foldtext = &l:foldtext
+
+  " save folds
+  let original_state.foldstate = []
+  let original_pos = getpos('.')
+  let line = 1
+  while line <= line('$')
+    if 0 < foldclosed(line)  " is the first line of a fold?
+      call add(original_state.foldstate, line)
+      let line = foldclosedend(line) + 1
+    else
+      let previous_line = line
+      call cursor(previous_line, 0)
+      normal! zj
+      let line = line('.')
+      if line == previous_line
+        break  " no more folds.
+      endif
+    endif
+  endwhile
+  call setpos('.', original_pos)
+
   return original_state
 endfunction
@@ -146 +153 @@
 
 function! s:load_the_state_of_buffer(original_state)  "{{{2
-  call s:set_view_options()
-  loadview
-  call s:restore_view_options()
-
   let &l:foldenable = a:original_state.foldenable
   let &l:foldmethod = a:original_state.foldmethod
   let &l:foldtext = a:original_state.foldtext
+
+  " restore folds.
+  %foldopen!
+  for line in a:original_state.foldstate
+    call cursor(line, 0)
+    foldclose
+  endfor
 endfunction
 

lang/vim/narrow/trunk/doc/narrow.txt

@@ -1 +1 @@
 *narrow.txt*    Emulate Emacs' narrowing feature
 
-Version 0.1
+Version 0.2
 Copyright (C) 2007 kana <http://nicht.s8.xrea.com/>
 License: MIT license (see <http://www.opensource.org/licenses/mit-license>)
@@ -81 +81 @@
   In Emacs, these actions aren't allowed.
 
-- This plugin uses |:mkview| to save the current state of a buffer for
-  |:Widen|, and and |:mkview| writes a file.  So this plugin may be confused
-  when there are two or more Vim processes and they narrow/widen the same
-  buffers.
-
-- Temporary files written by |:mkview| will be created in the "narrow"
-  subdirectory in 'viewdir'.  For example, "~/.vim/view/narrow".
-
 
 
@@ -94 +86 @@
 ==============================================================================
 CHANGELOG                                       *narrow-changelog*
+
+0.2     2007-12-29T07:24:53+09:00
+        - Fix |:Narrow| and |:Widen| not to use temporary files.  Now |:Widen|
+          correctly works even if the target buffer is |:Narrow|'ed by two or
+          more Vim processes.
+        - Modify |:Narrow| to |zz| after narrowing for visibility.
+        - Modify |:Narrow| to include all lines of closed folds in [range].
 
 0.1     2007-12-28T01:13:48+09:00

lang/vim/narrow/trunk/plugin/narrow.vim

@@ -1 +1 @@
 " narrow - Emulate Emacs' narrowing feature
-" Version: 0.1
+" Version: 0.2
 " Copyright (C) 2007 kana <http://nicht.s8.xrea.com/>
 " License: MIT license (see <http://www.opensource.org/licenses/mit-license>)