summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2018-07-22 22:31:46 +0100
committerw0rp <devw0rp@gmail.com>2018-07-22 22:31:46 +0100
commit846bfb47b2e213c5627eb614f7a436089c1b4896 (patch)
treed38fea57c2c4ad6ce017b891c4e4b625160a97ef
parent81a8c77d2062fb7b9bb85d2835a64f01b80bb2a4 (diff)
downloadale-846bfb47b2e213c5627eb614f7a436089c1b4896.zip
Remove the redundant fix_buffer_data vars and filename variables
-rw-r--r--autoload/ale.vim7
-rw-r--r--autoload/ale/fix.vim2
-rw-r--r--test/fix/test_ale_fix.vader2
-rw-r--r--test/test_ale_var.vader12
4 files changed, 1 insertions, 22 deletions
diff --git a/autoload/ale.vim b/autoload/ale.vim
index 26c73547..6d1e8521 100644
--- a/autoload/ale.vim
+++ b/autoload/ale.vim
@@ -192,12 +192,7 @@ endfunction
" Every variable name will be prefixed with 'ale_'.
function! ale#Var(buffer, variable_name) abort
let l:full_name = 'ale_' . a:variable_name
- let l:vars = getbufvar(str2nr(a:buffer), '', 0)
-
- if l:vars is 0
- " Look for variables from deleted buffers, saved from :ALEFix
- let l:vars = get(get(g:ale_fix_buffer_data, a:buffer, {}), 'vars', {})
- endif
+ let l:vars = getbufvar(str2nr(a:buffer), '', {})
return get(l:vars, l:full_name, g:[l:full_name])
endfunction
diff --git a/autoload/ale/fix.vim b/autoload/ale/fix.vim
index 62674b87..8dfdeca8 100644
--- a/autoload/ale/fix.vim
+++ b/autoload/ale/fix.vim
@@ -420,9 +420,7 @@ function! ale#fix#InitBufferData(buffer, fixing_flag) abort
" The 'done' flag tells the function for applying changes when fixing
" is complete.
let g:ale_fix_buffer_data[a:buffer] = {
- \ 'vars': getbufvar(a:buffer, ''),
\ 'lines_before': getbufline(a:buffer, 1, '$'),
- \ 'filename': expand('#' . a:buffer . ':p'),
\ 'done': 0,
\ 'should_save': a:fixing_flag is# 'save_file',
\ 'temporary_directory_list': [],
diff --git a/test/fix/test_ale_fix.vader b/test/fix/test_ale_fix.vader
index 80eda4a0..14206d8d 100644
--- a/test/fix/test_ale_fix.vader
+++ b/test/fix/test_ale_fix.vader
@@ -552,8 +552,6 @@ Execute(ale#fix#InitBufferData() should set up the correct data):
AssertEqual {
\ bufnr(''): {
\ 'temporary_directory_list': [],
- \ 'vars': b:,
- \ 'filename': ale#path#Simplify(getcwd() . '/fix_test_file'),
\ 'done': 0,
\ 'lines_before': ['a', 'b', 'c'],
\ 'should_save': 1,
diff --git a/test/test_ale_var.vader b/test/test_ale_var.vader
index 5f42fe95..419a9983 100644
--- a/test/test_ale_var.vader
+++ b/test/test_ale_var.vader
@@ -5,8 +5,6 @@ After:
unlet! g:ale_some_variable
unlet! b:undefined_variable_name
- let g:ale_fix_buffer_data = {}
-
Execute(ale#Var should return global variables):
AssertEqual 'abc', ale#Var(bufnr(''), 'some_variable')
@@ -24,13 +22,3 @@ Execute(ale#Var should throw exceptions for undefined variables):
let b:undefined_variable_name = 'def'
AssertThrows call ale#Var(bufnr(''), 'undefined_variable_name')
-
-Execute(ale#Var return variables from deleted buffers, saved for fixing things):
- let g:ale_fix_buffer_data[1347347] = {'vars': {'ale_some_variable': 'def'}}
-
- AssertEqual 'def', ale#Var(1347347, 'some_variable')
-
-Execute(ale#Var should return the global variable for unknown variables):
- let g:ale_fix_buffer_data = {}
-
- AssertEqual 'abc', ale#Var(1347347, 'some_variable')