-
-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add option to format tables with gq mapping (formatexpr)
- Loading branch information
1 parent
62a7873
commit 87291af
Showing
8 changed files
with
200 additions
and
21 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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,88 @@ | ||
| local ts_utils = require('nvim-treesitter.ts_utils') | ||
| local Table = require('orgmode.parser.table') | ||
| local utils = require('orgmode.utils') | ||
| local config = require('orgmode.config') | ||
| local query = vim.treesitter.query | ||
|
|
||
| ---@class TsTable | ||
| ---@field node userdata | ||
| ---@field data table[] | ||
| local TsTable = {} | ||
|
|
||
| function TsTable:new(opts) | ||
| local data = {} | ||
| data.node = opts.node | ||
| setmetatable(data, self) | ||
| self.__index = self | ||
| data:_parse_data() | ||
| return data | ||
| end | ||
|
|
||
| ---@private | ||
| --- Parse table data from node | ||
| function TsTable:_parse_data() | ||
| local rows = {} | ||
| for row in self.node:iter_children() do | ||
| if row:type() == 'hr' then | ||
| table.insert(rows, 'hr') | ||
| end | ||
| if row:type() == 'row' then | ||
| local row_data = {} | ||
| for cell in row:iter_children() do | ||
| if cell:type() == 'cell' then | ||
| local cell_val = '' | ||
| local cell_content = cell:field('contents') | ||
| if cell_content and #cell_content > 0 then | ||
| cell_val = query.get_node_text(cell_content[1], 0) | ||
| end | ||
| table.insert(row_data, cell_val) | ||
| end | ||
| end | ||
| table.insert(rows, row_data) | ||
| end | ||
| end | ||
|
|
||
| self.data = rows | ||
| end | ||
|
|
||
| function TsTable:rerender() | ||
| local start_row, start_col = self.node:range() | ||
| local tbl = Table.from_list(self.data, start_row + 1, start_col + 1) | ||
| local first_line = vim.api.nvim_buf_get_lines(0, start_row, start_row + 1, true) | ||
| local indent = first_line and first_line[1]:match('^%s*') or '' | ||
| indent = config:get_indent(indent:len()) | ||
|
|
||
| local contents = tbl:draw() | ||
| local indented = {} | ||
| for _, content in ipairs(contents) do | ||
| table.insert(indented, string.format('%s%s', indent, content)) | ||
| end | ||
| local view = vim.fn.winsaveview() | ||
| vim.api.nvim_buf_set_lines(0, tbl.range.start_line - 1, tbl.range.end_line - 1, false, indented) | ||
| vim.fn.winrestview(view) | ||
| end | ||
|
|
||
| local function format() | ||
| local view = vim.fn.winsaveview() | ||
| -- Go to first non blank char | ||
| vim.cmd([[norm! _]]) | ||
| local node = ts_utils.get_node_at_cursor() | ||
| vim.fn.winrestview(view) | ||
|
|
||
| if not node then | ||
| return false | ||
| end | ||
| print(node:type()) | ||
| print(node:type()) | ||
| print(node:type()) | ||
| local table_node = utils.get_closest_parent_of_type(node, 'table', true) | ||
| if not table_node then | ||
| return false | ||
| end | ||
| TsTable:new({ node = table_node }):rerender() | ||
| return true | ||
| end | ||
|
|
||
| return { | ||
| format = format, | ||
| } |
This file contains 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 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,56 @@ | ||
| local helpers = require('tests.plenary.ui.helpers') | ||
|
|
||
| describe('Tables', function() | ||
| after_each(function() | ||
| vim.cmd([[silent! %bw!]]) | ||
| end) | ||
|
|
||
| it('should generate basic table structure from pipe or hr line', function() | ||
| helpers.load_file_content({ | ||
| '|', | ||
| }) | ||
| vim.fn.cursor({ 1, 1 }) | ||
| vim.cmd([[norm gqgq]]) | ||
| assert.are.same({ '| |' }, vim.api.nvim_buf_get_lines(0, 0, -1, false)) | ||
|
|
||
| helpers.load_file_content({ | ||
| '|-', | ||
| }) | ||
|
|
||
| vim.cmd([[norm gqgq]]) | ||
| assert.are.same({ '|--|' }, vim.api.nvim_buf_get_lines(0, 0, -1, false)) | ||
| end) | ||
|
|
||
| it('should format the table', function() | ||
| helpers.load_file_content({ | ||
| ' |head1 | ', | ||
| ' |- ', | ||
| ' |content| ', | ||
| }) | ||
| vim.fn.cursor({ 2, 1 }) | ||
| vim.cmd([[norm! gqgq]]) | ||
|
|
||
| assert.are.same({ | ||
| ' | head1 |', | ||
| ' |---------|', | ||
| ' | content |', | ||
| }, vim.api.nvim_buf_get_lines(0, 0, -1, false)) | ||
| end) | ||
|
|
||
| it('should format multi column table', function() | ||
| helpers.load_file_content({ | ||
| '|first|second|', | ||
| '|-', | ||
| '|third cell| fourth cell|', | ||
| '|fifth|sixth| seventh', | ||
| }) | ||
| vim.fn.cursor({ 1, 1 }) | ||
| vim.cmd([[norm gqgq]]) | ||
| assert.are.same({ | ||
| '| first | second | |', | ||
| '|------------+-------------+---------|', | ||
| '| third cell | fourth cell | |', | ||
| '| fifth | sixth | seventh |', | ||
| }, vim.api.nvim_buf_get_lines(0, 0, -1, false)) | ||
| end) | ||
| end) |