diff --git a/README.md b/README.md index 4075c734..2e0ae470 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,7 @@ Edit and review GitHub issues and pull requests from the comfort of your favorit - Install [GitHub CLI](https://cli.github.com/) - Install [plenary.nvim](https://github.com/nvim-lua/plenary.nvim) -- Install one of: - - [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) - - [fzf-lua](https://github.com/ibhagwan/fzf-lua) +- Install [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) - Install [nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons) ## 📦 Installation @@ -75,7 +73,6 @@ use { requires = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope.nvim', - -- OR 'ibhagwan/fzf-lua', 'nvim-tree/nvim-web-devicons', }, config = function () @@ -115,14 +112,9 @@ require"octo".setup({ snippet_context_lines = 4; -- number or lines around commented lines gh_env = {}, -- extra environment variables to pass on to GitHub CLI, can be a table or function returning a table timeout = 5000, -- timeout for requests between the remote server - default_to_projects_v2 = false, -- use projects v2 for the `Octo card ...` command by default. Both legacy and v2 commands are available under `Octo cardlegacy ...` and `Octo cardv2 ...` respectively. ui = { use_signcolumn = true, -- show "modified" marks on the sign column }, - picker = "telescope", -- "telescope" | "fzf-lua" - picker_config = { - use_emojis = false, -- Only used in fzf-lua picker. If you want emojis when viewing the picker set to true. - }, issues = { order_by = { -- criteria to sort results of `Octo issue list` field = "CREATED_AT", -- either COMMENTS, CREATED_AT or UPDATED_AT (https://docs.github.com/en/graphql/reference/enums#issueorderfield) diff --git a/lua/octo/commands.lua b/lua/octo/commands.lua index 4d3ad3c1..72afa1ca 100644 --- a/lua/octo/commands.lua +++ b/lua/octo/commands.lua @@ -17,32 +17,6 @@ function M.setup() vim.api.nvim_create_user_command("Octo", function(opts) require("octo.commands").octo(unpack(opts.fargs)) end, { complete = require("octo.completion").octo_command_complete, nargs = "*" }) - local conf = config.values - - local card_commands - - if conf.default_to_projects_v2 then - card_commands = { - set = function() - M.set_project_v2_card() - end, - remove = function() - M.remove_project_v2_card() - end, - } - else - card_commands = { - add = function() - M.add_project_card() - end, - move = function() - M.move_project_card() - end, - remove = function() - M.remove_project_card() - end, - } - end -- supported commands M.commands = { @@ -321,16 +295,7 @@ function M.setup() M.reaction_action "HEART" end, }, - card = card_commands, - cardv2 = { - set = function(...) - M.set_project_v2_card() - end, - remove = function() - M.remove_project_v2_card() - end, - }, - cardlegacy = { + card = { add = function() M.add_project_card() end, @@ -1326,80 +1291,6 @@ function M.move_project_card() end) end -function M.set_project_v2_card() - local bufnr = vim.api.nvim_get_current_buf() - local buffer = octo_buffers[bufnr] - if not buffer then - return - end - - -- show column selection picker - picker.project_columns_v2(function(project_id, field_id, value) - -- add new card - local add_query = graphql("add_project_v2_item_mutation", buffer.node.id, project_id) - gh.run { - args = { "api", "graphql", "--paginate", "-f", string.format("query=%s", add_query) }, - cb = function(add_output, add_stderr) - if add_stderr and not utils.is_blank(add_stderr) then - utils.error(add_stderr) - elseif add_output then - local resp = vim.fn.json_decode(add_output) - local update_query = graphql( - "update_project_v2_item_mutation", - project_id, - resp.data.addProjectV2ItemById.item.id, - field_id, - value - ) - gh.run { - args = { "api", "graphql", "--paginate", "-f", string.format("query=%s", update_query) }, - cb = function(update_output, update_stderr) - if update_stderr and not utils.is_blank(update_stderr) then - utils.error(update_stderr) - elseif update_output then - -- TODO do update here - -- refresh issue/pr details - require("octo").load(buffer.repo, buffer.kind, buffer.number, function(obj) - writers.write_details(bufnr, obj, true) - buffer.node.projectCards = obj.projectCards - end) - end - end, - } - end - end, - } - end) -end - -function M.remove_project_v2_card() - local bufnr = vim.api.nvim_get_current_buf() - local buffer = octo_buffers[bufnr] - if not buffer then - return - end - - -- show card selection picker - picker.project_cards_v2(function(project_id, item_id) - -- delete card - local query = graphql("delete_project_v2_item_mutation", project_id, item_id) - gh.run { - args = { "api", "graphql", "--paginate", "-f", string.format("query=%s", query) }, - cb = function(output, stderr) - if stderr and not utils.is_blank(stderr) then - utils.error(stderr) - elseif output then - -- refresh issue/pr details - require("octo").load(buffer.repo, buffer.kind, buffer.number, function(obj) - buffer.node.projectCards = obj.projectCards - writers.write_details(bufnr, obj, true) - end) - end - end, - } - end) -end - function M.reload(bufnr) require("octo").load_buffer(bufnr) end diff --git a/lua/octo/completion.lua b/lua/octo/completion.lua index f5e6fdf8..2cb4a1f6 100644 --- a/lua/octo/completion.lua +++ b/lua/octo/completion.lua @@ -25,8 +25,10 @@ function M.octo_command_complete(argLead, cmdLine) return get_options(command_keys) elseif #parts == 2 and vim.tbl_contains(command_keys, parts[2]) or #parts == 3 then local obj = octo_commands.commands[parts[2]] - if type(obj) == "table" then - return get_options(vim.tbl_keys(obj)) + if obj then + if type(obj) == "table" then + return get_options(vim.tbl_keys(obj)) + end end end end diff --git a/lua/octo/config.lua b/lua/octo/config.lua index 42fc2443..deb94c76 100644 --- a/lua/octo/config.lua +++ b/lua/octo/config.lua @@ -60,7 +60,6 @@ local M = {} ---@field snippet_context_lines number ---@field gh_env table ---@field timeout number ----@field default_to_projects_v2 boolean ---@field ui OctoConfigUi ---@field issues OctoConfigIssues ---@field pull_requests OctoConfigPR @@ -99,7 +98,6 @@ function M.get_default_values() snippet_context_lines = 4, gh_env = {}, timeout = 5000, - default_to_projects_v2 = false, ui = { use_signcolumn = true, }, diff --git a/lua/octo/gh/graphql.lua b/lua/octo/gh/graphql.lua index 7fbc7eef..e9652335 100644 --- a/lua/octo/gh/graphql.lua +++ b/lua/octo/gh/graphql.lua @@ -46,7 +46,7 @@ M.resolve_review_thread_mutation = [[ path pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -111,7 +111,7 @@ M.unresolve_review_thread_mutation = [[ path pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -173,7 +173,7 @@ M.start_review_mutation = [[ state pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path line @@ -272,8 +272,8 @@ M.submit_pull_request_review_mutation = [[ ]] M.delete_pull_request_review_mutation = [[ -mutation { - deletePullRequestReview(input: {pullRequestReviewId: "%s"}) { +mutation { + deletePullRequestReview(input: {pullRequestReviewId: "%s"}) { pullRequestReview { id state @@ -284,8 +284,8 @@ mutation { -- https://docs.github.com/en/graphql/reference/mutations#addpullrequestreviewthread M.add_pull_request_review_thread_mutation = [[ -mutation { - addPullRequestReviewThread(input: { pullRequestReviewId: "%s", body: "%s", path: "%s", side: %s, line:%d}) { +mutation { + addPullRequestReviewThread(input: { pullRequestReviewId: "%s", body: "%s", path: "%s", side: %s, line:%d}) { thread { id comments(last:100) { @@ -319,11 +319,11 @@ mutation { totalCount } } - } + } } pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -378,8 +378,8 @@ mutation { -- https://docs.github.com/en/graphql/reference/mutations#addpullrequestreviewthread M.add_pull_request_review_multiline_thread_mutation = [[ -mutation { - addPullRequestReviewThread(input: { pullRequestReviewId: "%s", body: "%s", path: "%s", startSide: %s, side: %s, startLine: %d, line:%d}) { +mutation { + addPullRequestReviewThread(input: { pullRequestReviewId: "%s", body: "%s", path: "%s", startSide: %s, side: %s, startLine: %d, line:%d}) { thread { id comments(last:100) { @@ -413,11 +413,11 @@ mutation { totalCount } } - } + } } pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -505,7 +505,7 @@ M.update_pull_request_review_comment_mutation = [[ body pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -580,7 +580,7 @@ M.add_pull_request_review_comment_mutation = [[ body pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -642,7 +642,7 @@ M.add_pull_request_review_commit_thread_mutation = [[ body pullRequest { reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -725,7 +725,7 @@ M.delete_pull_request_review_comment_mutation = [[ pullRequest { id reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -1123,8 +1123,8 @@ M.update_pull_request_state_mutation = [[ files(first:100) { nodes { path - viewerViewedState - } + viewerViewedState + } } merged mergedBy { @@ -1246,7 +1246,7 @@ M.update_pull_request_state_mutation = [[ login } } - } + } } ... on MergedEvent { createdAt @@ -1395,7 +1395,7 @@ M.update_pull_request_state_mutation = [[ -- https://docs.github.com/en/graphql/reference/objects#pullrequestreviewthread M.pending_review_threads_query = [[ -query { +query { repository(owner:"%s", name:"%s") { pullRequest (number: %d){ reviews(first:100, states:PENDING) { @@ -1405,7 +1405,7 @@ query { } } reviewThreads(last:100) { - nodes { + nodes { id path diffSide @@ -1539,8 +1539,8 @@ query($endCursor: String) { files(first:100) { nodes { path - viewerViewedState - } + viewerViewedState + } } merged mergedBy { @@ -1599,28 +1599,6 @@ query($endCursor: String) { } } } - projectItems(first: 100) { - nodes { - id - project { - id - title - } - fieldValues(first: 100) { - nodes { - ... on ProjectV2ItemFieldSingleSelectValue { - name - optionId - field { - ... on ProjectV2SingleSelectField { - name - } - } - } - } - } - } - } timelineItems(first: 100, after: $endCursor) { pageInfo { hasNextPage @@ -1677,7 +1655,7 @@ query($endCursor: String) { login } } - } + } } ... on MergedEvent { createdAt @@ -1943,28 +1921,6 @@ query($endCursor: String) { } } } - projectItems(first: 100) { - nodes { - id - project { - id - title - } - fieldValues(first: 100) { - nodes { - ... on ProjectV2ItemFieldSingleSelectValue { - name - optionId - field { - ... on ProjectV2SingleSelectField { - name - } - } - } - } - } - } - } timelineItems(first: 100, after: $endCursor) { pageInfo { hasNextPage @@ -2059,7 +2015,7 @@ query($endCursor: String) { -- https://docs.github.com/en/graphql/reference/unions#issueorpullrequest M.issue_kind_query = [[ -query { +query { repository(owner: "%s", name: "%s") { issueOrPullRequest(number: %d) { __typename @@ -2070,7 +2026,7 @@ query { -- https://docs.github.com/en/graphql/reference/unions#issueorpullrequest M.issue_summary_query = [[ -query { +query { repository(owner: "%s", name: "%s") { issueOrPullRequest(number: %d) { ... on PullRequest { @@ -2169,7 +2125,6 @@ query($endCursor: String) { url repository { nameWithOwner } headRefName - isDraft } pageInfo { hasNextPage @@ -2286,134 +2241,6 @@ M.delete_project_card_mutation = [[ } ]] --- https://docs.github.com/en/graphql/reference/objects#projectv2 -M.projects_query_v2 = [[ -query { - repository(owner: "%s", name: "%s") { - projects: projectsV2(first: 100) { - nodes { - id - title - url - closed - number - owner { - ... on User { - login - } - ... on Organization { - login - } - } - columns: field(name: "Status") { - ... on ProjectV2SingleSelectField { - id - options { - id - name - } - } - } - } - } - } - user(login: "%s") { - projects: projectsV2(first: 100) { - nodes { - id - title - url - closed - number - owner { - ... on User { - login - } - ... on Organization { - login - } - } - columns: field(name: "Status") { - ... on ProjectV2SingleSelectField { - id - options { - id - name - } - } - } - } - } - } - organization(login: "%s") { - projects: projectsV2(first: 100) { - nodes { - id - title - url - closed - number - owner { - ... on User { - login - } - ... on Organization { - login - } - } - columns: field(name: "Status") { - ... on ProjectV2SingleSelectField { - id - options { - id - name - } - } - } - } - } - } -} -]] - --- https://docs.github.com/en/graphql/reference/mutations#addprojectv2itembyid -M.add_project_v2_item_mutation = [[ - mutation { - addProjectV2ItemById(input: {contentId: "%s", projectId: "%s"}) { - item { - id - } - } - } -]] - --- https://docs.github.com/en/graphql/reference/mutations#updateprojectv2itemfieldvalue -M.update_project_v2_item_mutation = [[ - mutation { - updateProjectV2ItemFieldValue( - input: { - projectId: "%s", - itemId: "%s", - fieldId: "%s", - value: { singleSelectOptionId: "%s" } - } - ) { - projectV2Item { - id - } - } - } -]] - --- https://docs.github.com/en/graphql/reference/mutations#deleteprojectv2item -M.delete_project_v2_item_mutation = [[ - mutation { - deleteProjectV2Item(input: {projectId: "%s", itemId: "%s"}) { - deletedItemId - } - } -]] - -- https://docs.github.com/en/graphql/reference/mutations#createlabel -- requires application/vnd.github.bane-preview+json M.create_label_mutation = [[ @@ -2883,8 +2710,8 @@ M.create_pr_mutation = [[ files(first:100) { nodes { path - viewerViewedState - } + viewerViewedState + } } merged mergedBy { @@ -2995,7 +2822,7 @@ M.create_pr_mutation = [[ login } } - } + } } ... on MergedEvent { createdAt @@ -3213,7 +3040,7 @@ M.create_pr_mutation = [[ -- https://docs.github.com/en/graphql/reference/queries#user M.user_query = [[ -query { +query { user(login:"%s") { id } @@ -3222,7 +3049,7 @@ query { -- https://docs.github.com/en/graphql/reference/objects#pullrequestreviewthread M.repo_labels_query = [[ -query { +query { repository(owner:"%s", name:"%s") { labels(first: 100) { nodes { diff --git a/lua/octo/navigation.lua b/lua/octo/navigation.lua index 69f51949..af6346d0 100644 --- a/lua/octo/navigation.lua +++ b/lua/octo/navigation.lua @@ -51,8 +51,6 @@ function M.open_in_browser(kind, repo, number) cmd = string.format("gh repo view --web -R %s/%s", remote, repo) elseif kind == "gist" then cmd = string.format("gh gist view --web %s", number) - elseif kind == "project" then - cmd = string.format("gh project view --owner %s --web %s", repo, number) end end pcall(vim.cmd, "silent !" .. cmd) diff --git a/lua/octo/pickers/fzf-lua/entry_maker.lua b/lua/octo/pickers/fzf-lua/entry_maker.lua index 9600abbf..bb1d15dc 100644 --- a/lua/octo/pickers/fzf-lua/entry_maker.lua +++ b/lua/octo/pickers/fzf-lua/entry_maker.lua @@ -101,38 +101,6 @@ function M.gen_from_project_card(card) } end -function M.gen_from_project_v2(project) - if not project or vim.tbl_isempty(project) then - return nil - end - - local title = project.title - - if project.closed then - title = fzf.utils.ansi_from_hl("Comment", project.title) .. " " .. fzf.utils.ansi_from_hl("OctoPurple", "(closed)") - end - - return { - id = project.id, - repo = project.owner.login, - value = project.number, - ordinal = project.id .. " " .. title, - kind = "project", - obj = project, - } -end - -function M.gen_from_project_v2_column(column) - if not column or vim.tbl_isempty(column) then - return nil - end - return { - value = column.id, - ordinal = column.id .. " " .. column.name, - column = column, - } -end - function M.gen_from_label(label) if not label or vim.tbl_isempty(label) then return nil diff --git a/lua/octo/pickers/fzf-lua/pickers/project_cards.lua b/lua/octo/pickers/fzf-lua/pickers/project_cards.lua index 0b457f52..3a3cbf0a 100644 --- a/lua/octo/pickers/fzf-lua/pickers/project_cards.lua +++ b/lua/octo/pickers/fzf-lua/pickers/project_cards.lua @@ -8,7 +8,7 @@ return function(callback) local buffer = octo_buffers[bufnr] local cards = buffer.node.projectCards if not cards or #cards.nodes == 0 then - utils.error "Can't find any project cards" + utils.error "Cant find any project cards" return end diff --git a/lua/octo/pickers/fzf-lua/pickers/project_cards_v2.lua b/lua/octo/pickers/fzf-lua/pickers/project_cards_v2.lua deleted file mode 100644 index 24517da1..00000000 --- a/lua/octo/pickers/fzf-lua/pickers/project_cards_v2.lua +++ /dev/null @@ -1,53 +0,0 @@ -local fzf = require "fzf-lua" -local picker_utils = require "octo.pickers.fzf-lua.pickers.utils" -local utils = require "octo.utils" - -return function(callback) - local bufnr = vim.api.nvim_get_current_buf() - local buffer = octo_buffers[bufnr] - local cards = buffer.node.projectItems - if not cards or #cards.nodes == 0 then - utils.error "Can't find any project v2 cards" - return - end - - if #cards.nodes == 1 then - callback(cards.nodes[1].project.id, cards.nodes[1].id) - else - local titles = {} - - for _, card in ipairs(cards.nodes) do - local status = nil - - for _, node in ipairs(card.fieldValues.nodes) do - if node.field ~= nil and node.field.name == "Status" then - status = node.field.name - break - end - end - - if status == nil then - status = "" - end - - table.insert(titles, string.format("%s %s %s (%s)", card.project.id, card.id, status, card.project.title)) - end - - fzf.fzf_exec( - titles, - vim.tbl_deep_extend("force", picker_utils.dropdown_opts, { - fzf_opts = { - ["--no-multi"] = "", -- TODO this can support multi, maybe. - ["--delimiter"] = "' '", - ["--with-nth"] = "3..", - }, - actions = { - ["default"] = function(selected) - local project_id, item_id, _ = unpack(vim.split(selected[1], " ")) - callback(project_id, item_id) - end, - }, - }) - ) - end -end diff --git a/lua/octo/pickers/fzf-lua/pickers/project_columns_v2.lua b/lua/octo/pickers/fzf-lua/pickers/project_columns_v2.lua deleted file mode 100644 index 3f0154b9..00000000 --- a/lua/octo/pickers/fzf-lua/pickers/project_columns_v2.lua +++ /dev/null @@ -1,107 +0,0 @@ -local entry_maker = require "octo.pickers.fzf-lua.entry_maker" -local fzf = require "fzf-lua" -local gh = require "octo.gh" -local graphql = require "octo.gh.graphql" -local picker_utils = require "octo.pickers.fzf-lua.pickers.utils" -local utils = require "octo.utils" -local fzf_actions = require "octo.pickers.fzf-lua.pickers.fzf_actions" - -return function(cb) - local bufnr = vim.api.nvim_get_current_buf() - local buffer = octo_buffers[bufnr] - if not buffer then - return - end - - local formatted_projects = {} - local common_fzf_opts = vim.tbl_deep_extend("force", picker_utils.dropdown_opts, { - fzf_opts = { - ["--delimiter"] = "' '", - ["--with-nth"] = "2..", - }, - }) - - local get_projects = function(fzf_cb) - local query = graphql("projects_query_v2", buffer.owner, buffer.name, vim.g.octo_viewer, buffer.owner) - gh.run { - args = { "api", "graphql", "--paginate", "-f", string.format("query=%s", query) }, - cb = function(output) - if output then - local resp = vim.fn.json_decode(output) - - local unsorted_projects = {} - local user_projects = resp.data.user and resp.data.user.projects.nodes or {} - local repo_projects = resp.data.repository and resp.data.repository.projects.nodes or {} - local org_projects = not resp.errors and resp.data.organization.projects.nodes or {} - vim.list_extend(unsorted_projects, repo_projects) - vim.list_extend(unsorted_projects, user_projects) - vim.list_extend(unsorted_projects, org_projects) - - local projects = {} - for _, project in ipairs(unsorted_projects) do - if project.closed then - table.insert(projects, #projects + 1, project) - else - table.insert(projects, 0, project) - end - end - - if #projects == 0 then - utils.error(string.format("There are no matching projects for %s.", buffer.repo)) - fzf_cb() - end - - for _, project in ipairs(projects) do - local entry = entry_maker.gen_from_project_v2(project) - - if entry ~= nil then - formatted_projects[entry.ordinal] = entry - fzf_cb(entry.ordinal) - end - end - end - - fzf_cb() - end, - } - end - - local default_action = function(selected_project) - local entry_project = formatted_projects[selected_project[1]] - - local formatted_project_columns = {} - local project_column_titles = {} - - for _, project_column in ipairs(entry_project.obj.columns.options) do - local entry_column = entry_maker.gen_from_project_v2_column(project_column) - - if entry_column ~= nil then - formatted_project_columns[entry_column.ordinal] = entry_column - table.insert(project_column_titles, entry_column.ordinal) - end - end - - fzf.fzf_exec( - project_column_titles, - vim.tbl_deep_extend("force", common_fzf_opts, { - actions = { - ["default"] = function(selected_column) - local entry_column = formatted_project_columns[selected_column[1]] - cb(entry_project.id, entry_project.obj.columns.id, entry_column.value) - end, - }, - }) - ) - end - - fzf.fzf_exec( - get_projects, - vim.tbl_deep_extend("force", common_fzf_opts, { - actions = vim.tbl_deep_extend("force", fzf_actions.common_open_actions(formatted_projects), { - ["default"] = { - default_action, - }, - }), - }) - ) -end diff --git a/lua/octo/pickers/fzf-lua/pickers/prs.lua b/lua/octo/pickers/fzf-lua/pickers/prs.lua index 90ae3e23..380455b7 100644 --- a/lua/octo/pickers/fzf-lua/pickers/prs.lua +++ b/lua/octo/pickers/fzf-lua/pickers/prs.lua @@ -59,13 +59,7 @@ return function(opts) if entry ~= nil then formatted_pulls[entry.ordinal] = entry - local highlight - if entry.obj.isDraft then - highlight = "OctoSymbol" - else - highlight = "OctoStateOpen" - end - local prefix = fzf.utils.ansi_from_hl(highlight, entry.value) + local prefix = fzf.utils.ansi_from_hl("Comment", entry.value) fzf_cb(prefix .. " " .. entry.obj.title) end end diff --git a/lua/octo/pickers/fzf-lua/pickers/search.lua b/lua/octo/pickers/fzf-lua/pickers/search.lua index 5ebb12d7..9780af67 100644 --- a/lua/octo/pickers/fzf-lua/pickers/search.lua +++ b/lua/octo/pickers/fzf-lua/pickers/search.lua @@ -71,7 +71,6 @@ return function(opts) prompt = picker_utils.get_prompt(opts.prompt_title), func_async_callback = false, previewer = previewers.search(), - query_delay = 500, fzf_opts = { ["--info"] = "default", ["--delimiter"] = "' '", diff --git a/lua/octo/pickers/fzf-lua/previewers.lua b/lua/octo/pickers/fzf-lua/previewers.lua index 47f20927..062d7a42 100644 --- a/lua/octo/pickers/fzf-lua/previewers.lua +++ b/lua/octo/pickers/fzf-lua/previewers.lua @@ -5,6 +5,7 @@ local graphql = require "octo.gh.graphql" local utils = require "octo.utils" local writers = require "octo.ui.writers" local config = require "octo.config" +local log = require "octo.pickers.fzf-lua.log" local M = {} diff --git a/lua/octo/pickers/fzf-lua/provider.lua b/lua/octo/pickers/fzf-lua/provider.lua index efb8fc8b..4fde1b81 100644 --- a/lua/octo/pickers/fzf-lua/provider.lua +++ b/lua/octo/pickers/fzf-lua/provider.lua @@ -12,9 +12,7 @@ M.picker = { labels = require "octo.pickers.fzf-lua.pickers.labels", pending_threads = require "octo.pickers.fzf-lua.pickers.pending_threads", project_cards = require "octo.pickers.fzf-lua.pickers.project_cards", - project_cards_v2 = require "octo.pickers.fzf-lua.pickers.project_cards_v2", project_columns = require "octo.pickers.fzf-lua.pickers.project_columns", - project_columns_v2 = require "octo.pickers.fzf-lua.pickers.project_columns_v2", prs = require "octo.pickers.fzf-lua.pickers.prs", repos = require "octo.pickers.fzf-lua.pickers.repos", review_commits = require "octo.pickers.fzf-lua.pickers.review_commits", diff --git a/lua/octo/pickers/telescope/provider.lua b/lua/octo/pickers/telescope/provider.lua index 6aefdaa5..a4afc37f 100644 --- a/lua/octo/pickers/telescope/provider.lua +++ b/lua/octo/pickers/telescope/provider.lua @@ -17,10 +17,6 @@ local sorters = require "telescope.sorters" local M = {} -function M.not_implemented() - utils.error "Not implemented yet" -end - local dropdown_opts = require("telescope.themes").get_dropdown { layout_config = { width = 0.4, @@ -1052,9 +1048,7 @@ M.picker = { changed_files = M.changed_files, pending_threads = M.pending_threads, project_cards = M.select_project_card, - project_cards_v2 = M.not_implemented, project_columns = M.select_target_project_column, - project_columns_v2 = M.not_implemented, labels = M.select_label, assigned_labels = M.select_assigned_label, users = M.select_user, diff --git a/lua/octo/pickers/vim-clap/provider.lua b/lua/octo/pickers/vim-clap/provider.lua index f5f949ac..b59dbc8f 100644 --- a/lua/octo/pickers/vim-clap/provider.lua +++ b/lua/octo/pickers/vim-clap/provider.lua @@ -15,9 +15,7 @@ M.picker = { changed_files = M.not_implemented, pending_threads = M.not_implemented, project_cards = M.not_implemented, - project_cards_v2 = M.not_implemented, project_columns = M.not_implemented, - project_columns_v2 = M.not_implemented, labels = M.not_implemented, assigned_labels = M.not_implemented, users = M.not_implemented, diff --git a/lua/octo/ui/writers.lua b/lua/octo/ui/writers.lua index 61b6bb7f..8c9f87e8 100644 --- a/lua/octo/ui/writers.lua +++ b/lua/octo/ui/writers.lua @@ -305,41 +305,6 @@ function M.write_details(bufnr, issue, update) table.insert(details, projects_vt) end - -- projects v2 - if issue.projectItems and #issue.projectItems.nodes > 0 then - local projects_vt = { - { "Projects (v2): ", "OctoDetailsLabel" }, - } - --local project_color = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("NormalFloat")), "bg#"):sub(2) - --local column_color = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("Comment")), "fg#"):sub(2) - for idx, item in ipairs(issue.projectItems.nodes) do - if item.project ~= vim.NIL then - if idx >= 2 then - table.insert(projects_vt, { ", " }) - end - - local status = nil - - for _, fieldValues in ipairs(item.fieldValues.nodes) do - if fieldValues.field ~= nil and fieldValues.field.name == "Status" then - status = fieldValues.name - end - end - - if status == nil then - table.insert(projects_vt, { "No status", "OctoRed" }) - else - table.insert(projects_vt, { status }) - end - - table.insert(projects_vt, { " (", "OctoDetailsLabel" }) - table.insert(projects_vt, { item.project.title }) - table.insert(projects_vt, { ")", "OctoDetailsLabel" }) - end - end - table.insert(details, projects_vt) - end - -- milestones local ms = issue.milestone local milestone_vt = {