Refactor range handling

Author: evanthegrayt

README.md

@@ -1,8 +1,8 @@
 # Noteworthy
 Note-taking is a practice that every good developer should employ, so why should
 the process be tedious? Noteworthy provides a very quick and painless way to
-create and open notes that are kept in predefined places. Works with both static
-and project-specific libraries.
+create, open, and search through notes that are kept in predefined places. Works
+with both static and project-specific libraries.
 
 ## Table of Contents
 - [Installation](#installation)

autoload/noteworthy.vim

@@ -1,29 +1,29 @@
 ""
 " Open/create a note.
-function! noteworthy#Note(line1, line2, ...) abort
-  call s:File('edit', a:000, a:line1, a:line2)
+function! noteworthy#Note(range, line1, line2, ...) abort
+  call s:File('edit', a:000, a:range, a:line1, a:line2)
 endfunction
 
 ""
 " Open/create a note in a new tab.
-function! noteworthy#Tnote(line1, line2, ...) abort
-  call s:File('tabedit', a:000, a:line1, a:line2)
+function! noteworthy#Tnote(range, line1, line2, ...) abort
+  call s:File('tabedit', a:000, a:range, a:line1, a:line2)
 endfunction
 
 ""
 " Open/create a note in a new split.
 function! noteworthy#Snote(line1, line2, ...) abort
   call s:File(get(
         \   g:, 'noteworthy_split_size', ''
-        \ ) . 'split', a:000, a:line1, a:line2)
+        \ ) . 'split', a:000, a:range, a:line1, a:line2)
 endfunction
 
 ""
 " Open/create a note in a new vertical split.
 function! noteworthy#Vnote(line1, line2, ...) abort
   call s:File(get(
         \   g:, 'noteworthy_vsplit_size', ''
-        \ ) . 'vsplit', a:000, a:line1, a:line2)
+        \ ) . 'vsplit', a:000, a:range, a:line1, a:line2)
 endfunction
 
 ""
@@ -181,12 +181,12 @@ endfunction
 
 ""
 " Create or open a note in the current library.
-function! s:File(command, segments, line1, line2) abort
+function! s:File(command, segments, range, line1, line2) abort
   let l:delim = s:GetNoteDelimiter()
   let l:fext = s:GetNoteFileExt()
   let l:file = s:GetFileName(a:segments, l:delim)
   let l:basedir = fnamemodify(l:file, ':h')
-  if a:line1 != 0 | let l:lines = getline(a:line1, a:line2) | endif
+  if a:range | let l:lines = getline(a:line1, a:line2) | endif
   if !isdirectory(l:basedir) | call mkdir(l:basedir, 'p') | endif
   execute a:command l:file
   if get(g:, 'noteworthy_use_header', 1) && getfsize(l:file) <= 0

plugin/noteworthy.vim

@@ -14,27 +14,27 @@ endif
 " :Note {topic}, ...
 " Create or edit a note. Opens in current window.
 command! -nargs=+ -range=0 -complete=custom,noteworthy#Completion Note
-      \ call noteworthy#Note(<range> ? <line1> : 0, <range> ? <line2> : 0, <f-args>)
+      \ call noteworthy#Note(<range>, <line1>, <line2>, <f-args>)
 
 ""
 " :[N]VNote {topic}, ...
 " Create or edit a note. Opens in vertical split, [N] columns wide (default:
 " split current window in half)
 command! -range=0 -nargs=+ -complete=custom,noteworthy#Completion Vnote
-      \ call noteworthy#Vnote(<range> ? <line1> : 0, <range> ? <line2> : 0, <f-args>)
+      \ call noteworthy#Vnote(<range>, <line1>, <line2>, <f-args>)
 
 ""
 " :[N]SNote {topic}, ...
 " Create or edit a note. Opens in split, [N] columns wide (default: split
 " current window in half)
 command! -range=0 -nargs=+ -complete=custom,noteworthy#Completion Snote
-      \ call noteworthy#Snote(<range> ? <line1> : 0, <range> ? <line2> : 0, <f-args>)
+      \ call noteworthy#Snote(<range>, <line1>, <line2>, <f-args>)
 
 ""
 " :TNote {topic}, ...
 " Create or edit a note. Opens in new tab.
 command! -range=0 -nargs=+ -complete=custom,noteworthy#Completion Tnote
-      \ call noteworthy#Tnote(<range> ? <line1> : 0, <range> ? <line2> : 0, <f-args>)
+      \ call noteworthy#Tnote(<range>, <line1>, <line2>, <f-args>)
 
 ""
 " :NoteLibrary [{directory}]