feat: create from selection

Author: rawnly

lua/gist/core/gh.lua

@@ -1,3 +1,4 @@
+local utils = require("gist.core.utils")
 local M = {}
 
 --- Creates a Github gist with the specified filename and description
@@ -10,36 +11,37 @@ local M = {}
 -- @return number|nil The error of the command
 function M.create_gist(filename, content, description, private)
 	local public_flag = private and "" or "--public"
-	local escaped_description = vim.fn.shellescape(description)
-
-	local cmd = string.format(
-		"gh gist create %s %s --filename %s -d %s",
-		vim.fn.expand("%"),
-		public_flag,
-		filename,
-		escaped_description
-	)
-
-	local handle = io.popen(cmd)
-
-	-- null check on handle
-	if handle == nil then
-		return nil
+	description = vim.fn.shellescape(description)
+
+	local cmd
+
+	if content ~= nil then
+		filename = vim.fn.shellescape(filename)
+		cmd = string.format("gh gist create -f %s -d %s %s", filename, description, public_flag)
+	else
+		-- expand filepath if no content is provided
+		cmd = string.format(
+			"gh gist create %s %s --filename %s -d %s",
+			vim.fn.expand("%"),
+			public_flag,
+			filename,
+			description
+		)
 	end
 
-	local output = handle:read("*a")
-	handle:close()
+	local output = utils.exec(cmd, content)
 
 	if vim.v.shell_error ~= 0 then
 		return output, vim.v.shell_error
 	end
 
-	local url = string.gsub(output, "\n", "")
+	local url = utils.extract_gist_url(output)
 
 	return url, nil
 end
 
 --- Reads the configuration from the user's vimrc
+--
 -- @return table A table with the configuration properties
 function M.read_config()
 	local ok, values = pcall(vim.api.nvim_get_var, { "gist_is_private", "gist_clipboard" })

lua/gist/core/utils.lua

@@ -1,23 +1,82 @@
 local M = {}
 
-function M.get_selection()
-	local start_line, start_col = unpack(vim.fn.getpos("'<")[2])
-	local end_line, end_col = unpack(vim.fn.getpos("'>")[2])
-
-	-- selection is empty
-	if start_line == end_line and start_col == end_col then
-		return nil
+local function is_visual()
+	if vim.fn.mode() ~= "v" and vim.fn.mode() ~= "V" and vim.fn.mode() ~= "<C-V>" then
+		return false
 	end
 
-	-- selection is not empty
+	return true
+end
+
+function M.get_current_selection(start_line, end_line)
 	local bufnr = vim.api.nvim_get_current_buf()
 
-	start_line = start_line - 1 -- convert to 0-based line number
-	end_line = end_line - 1 -- convert to 0-based line number
+	start_line = start_line - 1 -- Convert to 0-based line number
+	end_line = end_line - 1 -- Convert to 0-based line number
 
-	local lines = vim.api.nvim_buf_get_lines(bufnr, start_line, end_line, false)
+	local lines = vim.api.nvim_buf_get_lines(bufnr, start_line, end_line + 1, false)
 
 	return table.concat(lines, "\n")
 end
 
+function M.get_last_selection()
+	local bufnr = vim.api.nvim_get_current_buf()
+
+	-- Save the current cursor position
+	local saved_cursor = vim.api.nvim_win_get_cursor(0)
+
+	-- Get the start and end positions of the visual selection
+	vim.cmd("normal! gv")
+	local start_pos = vim.fn.getpos("'<")
+	local end_pos = vim.fn.getpos("'>")
+
+	-- Restore the cursor position
+	vim.api.nvim_win_set_cursor(0, saved_cursor)
+
+	local start_line = start_pos[2] - 1
+	local end_line = end_pos[2]
+	local content_lines = vim.api.nvim_buf_get_lines(bufnr, start_line, end_line, false)
+	local content = table.concat(content_lines, "\n")
+
+	return content
+end
+
+local function read_file(path)
+	local file = io.open(path, "rb") -- r read mode and b binary mode
+	if not file then
+		return nil
+	end
+	local content = file:read("*a") -- *a or *all reads the whole file
+	file:close()
+	return content
+end
+
+function M.exec(cmd, stdin)
+	print(string.format("Executing: %s", cmd))
+	local tmp = os.tmpname()
+
+	local pipe = io.popen(cmd .. "> " .. tmp, "w")
+
+	if not pipe then
+		return nil
+	end
+
+	if stdin then
+		pipe:write(stdin)
+	end
+
+	pipe:close()
+
+	local output = read_file(tmp)
+	os.remove(tmp)
+
+	return output
+end
+
+function M.extract_gist_url(output)
+	local pattern = "https://gist.github.com/%S+"
+
+	return output:match(pattern)
+end
+
 return M

lua/gist/init.lua

@@ -1,28 +1,21 @@
+local utils = require("gist.core.utils")
 local core = require("gist.core.gh")
 
 local M = {}
 
-function M.create_from_file(args)
+function M.create(start_line, end_line)
 	local config = core.read_config()
+	local content = nil
 
-	local filename = vim.fn.expand("%:t")
-	local description = ""
-
-	if args[1] ~= nil then
-		description = args[1]
-	end
-
-	if description == "" or description == nil then
-		vim.api.nvim_echo({
-			{ "No description provided" },
-		}, true, {})
-
-		description = vim.fn.input("Description: ")
+	if start_line ~= end_line then
+		content = utils.get_current_selection(start_line, end_line)
 	end
 
+	local filename = vim.fn.expand("%:t")
+	local description = vim.fn.input("Gist description: ")
 	local is_private = config.is_private or vim.fn.input("Create a private Gist? (y/n): ") == "y"
 
-	local url, err = core.create_gist(filename, nil, description, is_private)
+	local url, err = core.create_gist(filename, content, description, is_private)
 
 	if err ~= nil then
 		vim.api.nvim_err_writeln("Error creating Gist: " .. err)
@@ -32,10 +25,4 @@ function M.create_from_file(args)
 	end
 end
 
-function M.create_from_selection(opts)
-	vim.api.nvim_echo({
-		{ "Creating Gist from selection..." .. opts.args, "Identifier" },
-	}, true, {})
-end
-
 return M

plugin/gist.lua

@@ -1,18 +1,3 @@
-local gist = require("gist")
-
-vim.api.nvim_create_user_command("Rawnly", function(args)
-	vim.api.nvim_echo({
-		{ "Args: " .. table.concat(args, " "), "Identifier" },
-	}, true, {})
-end, {
-	nargs = "*",
-})
-
-vim.api.nvim_create_user_command("CreateFileGist", gist.create_from_file, {
-	desc = "Create a new gist from current file",
-	nargs = "*",
-})
-
-vim.api.nvim_create_user_command("CreateGist", gist.create_from_selection, {
-	desc = "Create a new gist from current selection",
-})
+vim.cmd([[
+    command! -range CreateGist :lua require("gist").create(<line1>, <line2>)
+]])