Update nvim.lua

lua/nvim.lua

@@ -19,6 +19,28 @@ local function nvim_echo(...)
 	vim.api.nvim_out_write("\n")
 end
 
+local window_options = {
+	          arab = true;       arabic = true;   breakindent = true; breakindentopt = true;
+	           bri = true;       briopt = true;            cc = true;           cocu = true;
+	          cole = true;  colorcolumn = true; concealcursor = true;   conceallevel = true;
+	           crb = true;          cuc = true;           cul = true;     cursorbind = true;
+	  cursorcolumn = true;   cursorline = true;          diff = true;            fcs = true;
+	           fdc = true;          fde = true;           fdi = true;            fdl = true;
+	           fdm = true;          fdn = true;           fdt = true;            fen = true;
+	     fillchars = true;          fml = true;           fmr = true;     foldcolumn = true;
+	    foldenable = true;     foldexpr = true;    foldignore = true;      foldlevel = true;
+	    foldmarker = true;   foldmethod = true;  foldminlines = true;    foldnestmax = true;
+	      foldtext = true;          lbr = true;           lcs = true;      linebreak = true;
+	          list = true;    listchars = true;            nu = true;         number = true;
+	   numberwidth = true;          nuw = true; previewwindow = true;            pvw = true;
+	relativenumber = true;    rightleft = true;  rightleftcmd = true;             rl = true;
+	           rlc = true;          rnu = true;           scb = true;            scl = true;
+	           scr = true;       scroll = true;    scrollbind = true;     signcolumn = true;
+	         spell = true;   statusline = true;           stl = true;            wfh = true;
+	           wfw = true;        winbl = true;      winblend = true;   winfixheight = true;
+	   winfixwidth = true; winhighlight = true;         winhl = true;           wrap = true;
+}
+
 -- `nvim.$method(...)` redirects to `nvim.api.nvim_$method(...)`
 -- `nvim.fn.$method(...)` redirects to `vim.api.nvim_call_function($method, {...})`
 -- TODO `nvim.ex.$command(...)` is approximately `:$command {...}.join(" ")`
@@ -45,11 +67,15 @@ return setmetatable({
 		__index = function(self, k)
 			local mt = getmetatable(self)
 			local x = mt[k]
-      if x ~= nil then
+			if x ~= nil then return x end
-        return x
+			local f
+			if k == 'line' then
+				f = function()
+					local pos = vim.api.nvim_win_get_cursor(0)
+					return vim.api.nvim_buf_get_lines(0, pos[1]-1, pos[1], 'line')[1]
 				end
-			local f = function(...)
+			elseif k == 'nr' then
-				vim.api['nvim_buf_'..k](0, ...)
+				f = vim.api.nvim_get_current_buf
 			end
 			mt[k] = f
 			return f
@@ -102,6 +128,18 @@ return setmetatable({
 			end
 		end
 	});
+	w = setmetatable({}, {
+		__index = function(_, k)
+			return vim.api.nvim_win_get_var(0, k)
+		end;
+		__newindex = function(_, k, v)
+			if v == nil then
+				return vim.api.nvim_win_del_var(0, k)
+			else
+				return vim.api.nvim_win_set_var(0, k, v)
+			end
+		end
+	});
 	o = setmetatable({}, {
 		__index = function(_, k)
 			return vim.api.nvim_get_option(k)
@@ -110,6 +148,7 @@ return setmetatable({
 			return vim.api.nvim_set_option(k, v)
 		end
 	});
+	-- TODO add warning if you try to use a window option here?
 	bo = setmetatable({}, {
 		__index = function(_, k)
 			return vim.api.nvim_buf_get_option(0, k)
@@ -118,6 +157,15 @@ return setmetatable({
 			return vim.api.nvim_buf_set_option(0, k, v)
 		end
 	});
+	wo = setmetatable({}, {
+		__index = function(_, k)
+			return vim.api.nvim_win_get_option(0, k)
+		end;
+		__newindex = function(_, k, v)
+			-- passing v == nil will clear the value, just like above.
+			return vim.api.nvim_win_set_option(0, k, v)
+		end
+	});
 	env = setmetatable({}, {
 		__index = function(_, k)
 			return vim.api.nvim_call_function('getenv', {k})