Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve highlighting of signature parameters when labels are of type string #2072

Merged
merged 9 commits into from
Oct 5, 2022
Merged

Improve highlighting of signature parameters when labels are of type string #2072

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0539dd7
use regex word boundary when looking for labels
predragnikolic Sep 27, 2022
c5e76d6
fix regression, match unicode characters
predragnikolic Sep 28, 2022
4bbb7c6
try not to use r", maybe that will fix the build
predragnikolic Sep 28, 2022
c50de9d
Revert "try not to use r", maybe that will fix the build"
predragnikolic Sep 28, 2022
6069e3d
escape rawLabel in regex
predragnikolic Sep 28, 2022
d1253e1
fix test
predragnikolic Sep 28, 2022
f64c8bc
prefer word boundary search else fallback to finding the first string…
predragnikolic Sep 28, 2022
0ecb93d
Revert "fix test"
predragnikolic Sep 28, 2022
09c4378
use (?<!\w){}(?!\w) to not have a fallback to the previous logic
predragnikolic Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion plugin/core/signature_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from .views import minihtml
import functools
import html
import re
import sublime


Expand Down Expand Up @@ -115,7 +116,8 @@ def _render_label(self, view: sublime.View, signature: SignatureInformation) ->
# route relies on the client being smart enough to figure where the parameter is inside of
# the signature label. The above case where the label is a tuple of (start, end) positions is much
# more robust.
start = label[prev:].find(rawlabel)
label_match = re.search(r"\b{}\b".format(re.escape(rawlabel)), label[prev:])
start = label_match.start() if label_match else label[prev:].find(rawlabel)
if start == -1:
debug("no match found for {}".format(rawlabel))
continue
Expand Down