fix(main): check if line is nil when colorizing lsp range #687

stong1994 · 2024-04-24T08:05:53Z

fix: #685

Regresion test

Platforms

windows
macOS
linux

Tasks

FzfxFiles
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-R to switch between restricted/unrestricted mode, and the lines count is consistent when press multiple times.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file, and open the test/hello world.txt, test/goodbye world/goodbye.lua files.
- Both fd and find works.
FzfxLiveGrep
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-R to switch between restricted/unrestricted mode, and the lines count is consistent when press multiple times.
- Use -w to match word only, use -g *.lua to search only lua files.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file, and open the test/hello world.txt, test/goodbye world/goodbye.lua files.
- Both rg and grep works.
FzfxBufLiveGrep
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Use -w to match word only, use -g *.lua to search only lua files.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
- Both rg and grep works.
FzfxBuffers
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-D to delete buffers, and delete the test/hello world.txt, test/goodbye world/goodbye.lua buffers.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
FzfxGFiles
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-W to switch between workspace/current folder mode.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
FzfxGLiveGrep
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
FzfxGStatus
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-W to switch between workspace/current folder mode.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
- Both with/without delta works.
FzfxGBranches
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-R/CTRL-O to switch between local/remote branches.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to checkout branch.
FzfxGCommits
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-A to switch between git repo commits/current buffer commits.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to copy commit hash.
- Both with/without delta works.
FzfxGBlame
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to copy commit hash.
- Both with/without delta works.
FzfxLspDiagnostics
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-W to switch between workspace/current buffer diagnostics.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
FzfxLspDefinitions, FzfxLspTypeDefinitions, FzfxLspReferences, FzfxLspImplementations
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Go to definitions/references (this is the most 2 easiest use case when developing this lua plugin with lua_ls).
- Press ESC to quit, ENTER to open file.
FzfxLspIncomingCalls, FzfxLspOutgoingCalls
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Go to incoming/outgoing calls.
- Press ESC to quit, ENTER to open file.
FzfxCommands
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-E/CTRL-A to switch between user/ex/all vim commands.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to feed vim command.
FzfxKeyMaps
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-O/CTRL-I/CTRL-A/CTRL-V to switch between normal/insert/visual/all vim key mappings.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to feed vim keys.
FzfxMarks
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file.
FzfxFileExplorer
- Press CTRL-J/CTRL-K to move down/up and preview contents.
- Press CTRL-U/CTRL-R to switch between filter/include hidden files mode.
- Press ALT-L/ALT-H to cd into folder and cd upper folder.
- Use V/W/P/R variants (visual selection, cursor word, yank text, resume last).
- Press ESC to quit, ENTER to open file, and open the test/hello world.txt, test/goodbye world/goodbye.lua files.
- All eza/lsd/ls works.

fix: linrongbin16#685

linrongbin16 · 2024-04-24T09:36:20Z

lua/fzfx/cfg/_lsp_locations.lua

@@ -47,6 +47,9 @@ end
 --- @param renderer fun(text:string):string
 --- @return string?
 M._colorize_lsp_range = function(line, range, renderer)
+  if not line then


hi @stong1994 ,

Can you use str.empty(line) to detect whether a line is nil or empty string?

I have identified the issue. It appears there is a problem when executing the vim.lsp.buf_request_sync function(the 'method' param is "callHierarchy/outgoingCalls"), as the response I received is incorrect.

I have generated some logs to help diagnose the problem, and here is the output:

The crux of the issue is that the sms_error.go file contains only 24 lines of code. However, the fromRange in the response is pointing to lines 38 and 68, which is not possible given the file's length.

hi @stong1994 , thanks to your work!

can you give me a golang repository that can reproduce this issue? so I may also could help fix this issue.

And, can you take a look at this line:

fzfx.nvim/lua/fzfx/cfg/_lsp_locations.lua

Line 398 in 9b70ddb

log.debug(

It's the request body that sent to the lsp server, can you help verify if the request is correct?

hi @stong1994 ,

Once you had tested these changes, please select the related items in the "Regresion test" check list, to make sure they're working.

hi @linrongbin16
The 'Ctrl+J' and 'Ctrl+K' shortcuts are not working. Could I be missing some configuration settings?

Press CTRL-J/CTRL-K to move down/up and preview contents.

In my configuration, there are key bindings set for <C-J> and <C-K>. How can I utilize these two shortcuts while using 'fzf'?

I think you can simply skip CTRL-J/CTRL-K keys.

Just see if the outgoing/incoming calls results are expected, without exceptions.

Ok, It works well in my macOS.

linrongbin16 · 2024-04-25T02:53:53Z

hi @stong1994 ,
CI lint issue is been fixed, please merge your PR with latest main branch.

stong1994 · 2024-04-25T03:26:11Z

hi @stong1994 , CI lint issue is been fixed, please merge your PR with latest main branch.

Should I create a new PR?

…_colorize_lsp_range

stong1994 · 2024-04-25T03:45:06Z

hi @stong1994 , CI lint issue is been fixed, please merge your PR with latest main branch.

Should I create a new PR?

Ok, I has merged the latest main branch

codecov · 2024-04-25T03:45:54Z

Codecov Report

Attention: Patch coverage is 5.88235% with 16 lines in your changes are missing coverage. Please review.

Project coverage is 79.10%. Comparing base (352906f) to head (f97c593).

Files	Patch %	Lines
lua/fzfx/cfg/_lsp_locations.lua	5.88%	16 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #687      +/-   ##
==========================================
- Coverage   79.11%   79.10%   -0.01%     
==========================================
  Files          53       53              
  Lines        6296     6298       +2     
==========================================
+ Hits         4981     4982       +1     
- Misses       1315     1316       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

change code style in _lsp_locations.lua

It lacks index check with filelines when calling _colorize_lsp_range in _render_lsp_hierarchy_line. After that, we don't need to check if line is empty.

check line when colorize lsp range

94fb49e

fix: linrongbin16#685

linrongbin16 reviewed Apr 24, 2024

View reviewed changes

Merge remote-tracking branch 'upstream/main' into fix/check_line_when…

b9ca42c

…_colorize_lsp_range

stong1994 added 4 commits April 26, 2024 09:52

styple: use 'str.not_empty' instead of 'nil'

a11ab68

style: use 'str.empty' instead of 'not str.not_empty'

d83cb6b

change code style in _lsp_locations.lua

fix: index check for fileline

2e8b18b

It lacks index check with filelines when calling _colorize_lsp_range in _render_lsp_hierarchy_line. After that, we don't need to check if line is empty.

fix: end position is not correct

f97c593

linrongbin16 merged commit ba8d3ef into linrongbin16:main Apr 26, 2024
9 checks passed

github-actions bot mentioned this pull request Apr 25, 2024

chore(main): release 6.4.0 #675

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(main): check if line is nil when colorizing lsp range #687

fix(main): check if line is nil when colorizing lsp range #687

stong1994 commented Apr 24, 2024 •

edited

Loading

linrongbin16 Apr 24, 2024

stong1994 Apr 25, 2024

linrongbin16 Apr 25, 2024 •

edited

Loading

linrongbin16 Apr 25, 2024

This comment was marked as resolved.

linrongbin16 Apr 26, 2024

stong1994 Apr 26, 2024

stong1994 Apr 26, 2024 •

edited

Loading

linrongbin16 Apr 26, 2024

stong1994 Apr 26, 2024

linrongbin16 commented Apr 25, 2024 •

edited

Loading

stong1994 commented Apr 25, 2024

stong1994 commented Apr 25, 2024

codecov bot commented Apr 25, 2024 •

edited

Loading

fix(main): check if line is nil when colorizing lsp range #687

fix(main): check if line is nil when colorizing lsp range #687

Conversation

stong1994 commented Apr 24, 2024 • edited Loading

Regresion test

Platforms

Tasks

linrongbin16 Apr 24, 2024

Choose a reason for hiding this comment

stong1994 Apr 25, 2024

Choose a reason for hiding this comment

linrongbin16 Apr 25, 2024 • edited Loading

Choose a reason for hiding this comment

linrongbin16 Apr 25, 2024

Choose a reason for hiding this comment

This comment was marked as resolved.

linrongbin16 Apr 26, 2024

Choose a reason for hiding this comment

stong1994 Apr 26, 2024

Choose a reason for hiding this comment

stong1994 Apr 26, 2024 • edited Loading

Choose a reason for hiding this comment

linrongbin16 Apr 26, 2024

Choose a reason for hiding this comment

stong1994 Apr 26, 2024

Choose a reason for hiding this comment

linrongbin16 commented Apr 25, 2024 • edited Loading

stong1994 commented Apr 25, 2024

stong1994 commented Apr 25, 2024

codecov bot commented Apr 25, 2024 • edited Loading

Codecov Report

stong1994 commented Apr 24, 2024 •

edited

Loading

linrongbin16 Apr 25, 2024 •

edited

Loading

stong1994 Apr 26, 2024 •

edited

Loading

linrongbin16 commented Apr 25, 2024 •

edited

Loading

codecov bot commented Apr 25, 2024 •

edited

Loading