pull changes from upstream #1932
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| return { | ||
| 'windwp/nvim-autopairs', | ||
| event = 'InsertEnter', | ||
| config = true, | ||
| -- use opts = {} for passing setup options | ||
| -- this is equivalent to setup({}) function | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| return { | ||
| 'sudormrfbin/cheatsheet.nvim', | ||
|
|
||
| requires = { | ||
| { 'nvim-telescope/telescope.nvim' }, | ||
| { 'nvim-lua/popup.nvim' }, | ||
| { 'nvim-lua/plenary.nvim' }, | ||
| }, | ||
| config = function() | ||
| require('cheatsheet').setup() | ||
| end, | ||
| vim.keymap.set('n', '<leader>sc', ':Cheatsheet<CR>', { desc = '[S]earch in [C]eatsheet' }), | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| return { | ||
| { | ||
| 'olexsmir/gopher.nvim', | ||
| ft = 'go', | ||
| -- branch = "develop" | ||
| -- (optional) updates the plugin's dependencies on each update | ||
| build = function() | ||
| vim.cmd.GoInstallDeps() | ||
| end, | ||
| ---@module "gopher" | ||
| ---@type gopher.Config | ||
| opts = {}, | ||
| config = function() | ||
| require('gopher').setup { | ||
| -- log level, you might consider using DEBUG or TRACE for debugging the plugin | ||
| log_level = vim.log.levels.INFO, | ||
|
|
||
| -- timeout for running internal commands | ||
| timeout = 2000, | ||
|
|
||
| -- timeout for running installer commands(e.g :GoDepsInstall, :GoDepsInstallSync) | ||
| installer_timeout = 999999, | ||
|
|
||
| -- user specified paths to binaries | ||
| commands = { | ||
| go = 'go', | ||
| gomodifytags = 'gomodifytags', | ||
| gotests = 'gotests', | ||
| impl = 'impl', | ||
| iferr = 'iferr', | ||
| }, | ||
| gotests = { | ||
| -- a default template that gotess will use. | ||
| -- gotets doesn't have template named `default`, we use it to represent absence of the provided template. | ||
| template = 'default', | ||
|
|
||
| -- path to a directory containing custom test code templates | ||
| template_dir = nil, | ||
|
|
||
| -- use named tests(map with test name as key) in table tests(slice of structs by default) | ||
| named = false, | ||
| }, | ||
| gotag = { | ||
| transform = 'snakecase', | ||
|
|
||
| -- default tags to add to struct fields | ||
| default_tag = 'json', | ||
|
|
||
| -- default tag option added struct fields, set to nil to disable | ||
| -- e.g: `option = "json=omitempty,xml=omitempty` | ||
| option = nil, | ||
| }, | ||
| iferr = { | ||
| -- choose a custom error message, nil to use default | ||
| -- e.g: `message = 'fmt.Errorf("failed to %w", err)'` | ||
| message = nil, | ||
| }, | ||
| json2go = { | ||
| -- command used to open interactive input. | ||
| -- e.g: `split`, `botright split`, `tabnew` | ||
| interactive_cmd = 'vsplit', | ||
|
|
||
| -- name of autogenerated struct | ||
| -- e.g: "MySuperCoolName" | ||
| type_name = nil, | ||
| }, | ||
| } | ||
| end, | ||
| }, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| return { | ||
| 'ThePrimeagen/harpoon', | ||
| branch = 'harpoon2', | ||
| commit = 'e76cb03', | ||
| dependencies = { 'nvim-lua/plenary.nvim' }, | ||
| config = function() | ||
| local harpoon = require 'harpoon' | ||
| harpoon:setup { | ||
| settings = { | ||
| save_on_toggle = true, | ||
| mark_branch = true, | ||
| }, | ||
| } | ||
|
|
||
| -- basic telescope configuration | ||
| local conf = require('telescope.config').values | ||
| local function toggle_telescope(harpoon_files) | ||
| local file_paths = {} | ||
| for _, item in ipairs(harpoon_files.items) do | ||
| table.insert(file_paths, item.value) | ||
| end | ||
|
|
||
| require('telescope.pickers') | ||
| .new({}, { | ||
| prompt_title = 'Harpoon', | ||
| finder = require('telescope.finders').new_table { | ||
| results = file_paths, | ||
| }, | ||
| previewer = conf.file_previewer {}, | ||
| sorter = conf.generic_sorter {}, | ||
| }) | ||
| :find() | ||
| end | ||
|
|
||
| vim.keymap.set('n', '<C-h>', function() | ||
| toggle_telescope(harpoon:list()) | ||
| end, { desc = 'Open harpoon window' }) | ||
|
|
||
| vim.keymap.set('n', '<leader>ha', function() | ||
| harpoon:list():add() | ||
| end, { desc = '[H]arpoon [A]dd mark' }) | ||
|
|
||
| vim.keymap.set('n', '<C-1>', function() | ||
| harpoon:list():select(1) | ||
| end) | ||
| vim.keymap.set('n', '<C-2>', function() | ||
| harpoon:list():select(2) | ||
| end) | ||
| vim.keymap.set('n', '<C-3>', function() | ||
| harpoon:list():select(3) | ||
| end) | ||
| vim.keymap.set('n', '<C-4>', function() | ||
| harpoon:list():select(4) | ||
| end) | ||
|
|
||
| -- Toggle previous & next buffers stored within Harpoon list | ||
| vim.keymap.set('n', '<leader>hp', function() | ||
| harpoon:list():prev() | ||
| end, { desc = '[H]arpoon [P]rev item' }) | ||
| vim.keymap.set('n', '<leader>hn', function() | ||
| harpoon:list():next() | ||
| end, { desc = '[H]arpoon [N]ext item' }) | ||
| end, | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vim.o.relative number =true