Merge pull request #409 from lambdalisue/use-const

Use `const` instead of `lockvar`
lambdalisue · Mar 28, 2022 · 53d8cf7 · 53d8cf7
2 parents 085b74e + 93d34cc
commit 53d8cf7
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 32 deletions.
diff --git a/autoload/fern.vim b/autoload/fern.vim
@@ -2,21 +2,14 @@ let s:root = expand('<sfile>:p:h')
 let s:Config = vital#fern#import('Config')
 
 " Define Public constant
-let g:fern#STATUS_NONE = 0
-let g:fern#STATUS_COLLAPSED = 1
-let g:fern#STATUS_EXPANDED = 2
-lockvar g:fern#STATUS_NONE
-lockvar g:fern#STATUS_COLLAPSED
-lockvar g:fern#STATUS_EXPANDED
+const g:fern#STATUS_NONE = 0
+const g:fern#STATUS_COLLAPSED = 1
+const g:fern#STATUS_EXPANDED = 2
 
-let g:fern#DEBUG = 0
-let g:fern#INFO = 1
-let g:fern#WARN = 2
-let g:fern#ERROR = 3
-lockvar g:fern#DEBUG
-lockvar g:fern#INFO
-lockvar g:fern#WARN
-lockvar g:fern#ERROR
+const g:fern#DEBUG = 0
+const g:fern#INFO = 1
+const g:fern#WARN = 2
+const g:fern#ERROR = 3
 
 " Define Public variables
 call s:Config.config(expand('<sfile>:p'), {

diff --git a/autoload/fern/logger.vim b/autoload/fern/logger.vim
@@ -84,11 +84,7 @@ function! s:format(level, args, sep) abort
 endfunction
 
 " For backword compatibility
-let g:fern#logger#DEBUG = g:fern#DEBUG
-let g:fern#logger#INFO = g:fern#INFO
-let g:fern#logger#WARN = g:fern#WARN
-let g:fern#logger#ERROR = g:fern#ERROR
-lockvar g:fern#logger#DEBUG
-lockvar g:fern#logger#INFO
-lockvar g:fern#logger#WARN
-lockvar g:fern#logger#ERROR
+const g:fern#logger#DEBUG = g:fern#DEBUG
+const g:fern#logger#INFO = g:fern#INFO
+const g:fern#logger#WARN = g:fern#WARN
+const g:fern#logger#ERROR = g:fern#ERROR
diff --git a/test/behavior/Fern.vimspec b/test/behavior/Fern.vimspec
@@ -1,8 +1,7 @@
 Describe Fern
   Before all
     let l:Join = function('fern#internal#filepath#join')
-    let workdir = tempname()
-    lockvar workdir
+    const workdir = tempname()
     call mkdir(Join([workdir, 'deep', 'alpha', 'beta']), 'p')
     call mkdir(Join([workdir, 'shallow', 'alpha']), 'p')
     call mkdir(Join([workdir, 'shallow', 'beta']), 'p')

diff --git a/test/behavior/alternate-file.vimspec b/test/behavior/alternate-file.vimspec
@@ -1,8 +1,7 @@
 Describe alternate-file
   Before all
     let fern_keepalt_on_edit = g:fern#keepalt_on_edit
-    let workdir = tempname()
-    lockvar workdir
+    const workdir = tempname()
     call mkdir(workdir, 'p')
     call writefile([], fern#internal#filepath#join([workdir, 'alpha']))
     call writefile([], fern#internal#filepath#join([workdir, 'beta']))

diff --git a/test/behavior/buffer-rename.vimspec b/test/behavior/buffer-rename.vimspec
@@ -1,7 +1,6 @@
 Describe buffer-rename
   Before
-    let workdir = tempname()
-    lockvar workdir
+    const workdir = tempname()
     call mkdir(workdir, 'p')
     call writefile([], fern#internal#filepath#join([workdir, 'alpha']))
     call writefile([], fern#internal#filepath#join([workdir, 'beta']))

diff --git a/test/behavior/jumplist.vimspec b/test/behavior/jumplist.vimspec
@@ -1,8 +1,7 @@
 Describe jumplist
   Before all
     let fern_keepjumps_on_edit = g:fern#keepjumps_on_edit
-    let workdir = tempname()
-    lockvar workdir
+    const workdir = tempname()
     call mkdir(workdir, 'p')
     call writefile([], fern#internal#filepath#join([workdir, 'alpha']))
     call writefile([], fern#internal#filepath#join([workdir, 'beta']))

diff --git a/test/behavior/special-characters.vimspec b/test/behavior/special-characters.vimspec
@@ -1,8 +1,7 @@
 Describe special-characters
   Before all
     let l:Join = function('fern#internal#filepath#join')
-    let workdir = tempname()
-    lockvar workdir
+    const workdir = tempname()
     let candidates = [
           \ ';',
           \ '#',