diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/cursor.lua | 100 | ||||
| -rw-r--r-- | lua/map-basic.lua | 2 |
2 files changed, 51 insertions, 51 deletions
diff --git a/lua/cursor.lua b/lua/cursor.lua index a42bd52..8ea3404 100644 --- a/lua/cursor.lua +++ b/lua/cursor.lua @@ -2,102 +2,102 @@ require 'busted.runner'() local win = vis.win --- check that cursor position remains unchanged after an invalid adjustment +-- check that selection position remains unchanged after an invalid adjustment local invalid_pos = function(place) - local pos = win.cursor.pos - local line = win.cursor.line - local col = win.cursor.col - win.cursor:to(line, col) + local pos = win.selection.pos + local line = win.selection.line + local col = win.selection.col + win.selection:to(line, col) assert.has_error(place) - assert.are.equal(pos, win.cursor.pos) - assert.are.equal(line, win.cursor.line) - assert.are.equal(col, win.cursor.col) + assert.are.equal(pos, win.selection.pos) + assert.are.equal(line, win.selection.line) + assert.are.equal(col, win.selection.col) end -describe("win.cursor", function() +describe("win.selection", function() it("initial position", function() - assert.are.equal(0, win.cursor.pos) + assert.are.equal(0, win.selection.pos) end) it("initial line", function() - assert.are.equal(1, win.cursor.line) + assert.are.equal(1, win.selection.line) end) it("initial column", function() - assert.are.equal(1, win.cursor.col) + assert.are.equal(1, win.selection.col) end) end) -describe("win.cursor.pos", function() +describe("win.selection.pos", function() it("= 0", function() - win.cursor.pos = 0 - assert.are.equal(0, win.cursor.pos) - assert.are.equal(1, win.cursor.line) - assert.are.equal(1, win.cursor.col) + win.selection.pos = 0 + assert.are.equal(0, win.selection.pos) + assert.are.equal(1, win.selection.line) + assert.are.equal(1, win.selection.col) end) it("= beyond end of file", function() - win.cursor.pos = win.file.size - local pos = win.cursor.pos - local line = win.cursor.line - local col = win.cursor.col - win.cursor.pos = 0 - -- cursor is placed on last valid position - win.cursor.pos = win.file.size+1 - assert.are.equal(pos, win.cursor.pos) - assert.are.equal(line, win.cursor.line) - assert.are.equal(col, win.cursor.col) + win.selection.pos = win.file.size + local pos = win.selection.pos + local line = win.selection.line + local col = win.selection.col + win.selection.pos = 0 + -- selection is placed on last valid position + win.selection.pos = win.file.size+1 + assert.are.equal(pos, win.selection.pos) + assert.are.equal(line, win.selection.line) + assert.are.equal(col, win.selection.col) end) end) -describe("win.cursor.to", function() +describe("win.selection.to", function() it("(5, 3)", function() - win.cursor:to(5, 3) - assert.are.equal(30, win.cursor.pos) - assert.are.equal(5, win.cursor.line) - assert.are.equal(3, win.cursor.col) + win.selection:to(5, 3) + assert.are.equal(30, win.selection.pos) + assert.are.equal(5, win.selection.line) + assert.are.equal(3, win.selection.col) end) it("(0, 0) invalid position", function() -- is that what we want? - win.cursor:to(0, 0) - assert.are.equal(0, win.cursor.pos) - assert.are.equal(1, win.cursor.line) - assert.are.equal(1, win.cursor.col) + win.selection:to(0, 0) + assert.are.equal(0, win.selection.pos) + assert.are.equal(1, win.selection.line) + assert.are.equal(1, win.selection.col) end) it("invalid position, negative line", function() - invalid_pos(function() win.cursor:to(-1, 0) end) + invalid_pos(function() win.selection:to(-1, 0) end) end) it("invalid position, negative column", function() - invalid_pos(function() win.cursor:to(0, -1) end) + invalid_pos(function() win.selection:to(0, -1) end) end) it("invalid position, non-integer line", function() - invalid_pos(function() win.cursor:to(1.5, 1) end) + invalid_pos(function() win.selection:to(1.5, 1) end) end) it("invalid position, non-integer column", function() - invalid_pos(function() win.cursor:to(1, 1.5) end) + invalid_pos(function() win.selection:to(1, 1.5) end) end) --[[ it("move beyond end of file", function() - win.cursor.pos = win.file.size - local pos = win.cursor.pos - local line = win.cursor.line - local col = win.cursor.col - win.cursor.pos = 0 - -- cursor is placed on last valid position - win.cursor:to(#win.file.lines+2, 1000) - assert.are.equal(pos, win.cursor.pos) - assert.are.equal(line, win.cursor.line) - assert.are.equal(col, win.cursor.col) + win.selection.pos = win.file.size + local pos = win.selection.pos + local line = win.selection.line + local col = win.selection.col + win.selection.pos = 0 + -- selection is placed on last valid position + win.selection:to(#win.file.lines+2, 1000) + assert.are.equal(pos, win.selection.pos) + assert.are.equal(line, win.selection.line) + assert.are.equal(col, win.selection.col) end) --]] diff --git a/lua/map-basic.lua b/lua/map-basic.lua index bb4a05f..b0ce941 100644 --- a/lua/map-basic.lua +++ b/lua/map-basic.lua @@ -26,7 +26,7 @@ local file = win.file describe("map", function() before_each(function() - win.cursor.pos = 0 + win.selection.pos = 0 end) after_each(function() |