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

Jump to bottom

修复clangd inlay hint不生效的问题 #1021

Merged
merged 4 commits into from
Aug 17, 2024
Merged

修复clangd inlay hint不生效的问题 #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45a18c3
fix lsp-bridge-epc-manager-manager nil caused by auto-insert-mode.
ipyffor Aug 11, 2024
fb31cae
Merge branch 'master' of https://github.com/manateelazycat/lsp-bridge
ipyffor Aug 11, 2024
928c17a
fix clangd inlay hints.
ipyffor Aug 15, 2024
db1935c
Merge branch 'master' of https://github.com/manateelazycat/lsp-bridge
ipyffor Aug 15, 2024
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
6 changes: 5 additions & 1 deletion core/lspserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,11 @@ def save_attribute_from_message(self, message):
("range_format_provider", ["result", "capabilities", "documentRangeFormattingProvider"]),
("signature_help_provider", ["result", "capabilities", "signatureHelpProvider"]),
("workspace_symbol_provider", ["result", "capabilities", "workspaceSymbolProvider"]),
("inlay_hint_provider", ["result", "capabilities", "inlayHintProvider", "resolveProvider"]),
# ("inlay_hint_provider", ["result", "capabilities", "inlayHintProvider", "resolveProvider"]),
("inlay_hint_provider", [
["result", "capabilities", "inlayHintProvider", "resolveProvider"],
["result", "capabilities", "clangdInlayHintsProvider"] # 兼容clangd
]),
("save_include_text", ["result", "capabilities", "textDocumentSync", "save", "includeText"]),
("text_document_sync", ["result", "capabilities", "textDocumentSync"]),
("semantic_tokens_provider", ["result", "capabilities", "semanticTokensProvider"])]
Expand Down
26 changes: 23 additions & 3 deletions core/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,13 +519,33 @@ def remove_duplicate_references(data):
result.append(item)
return result

# def get_nested_value(dct, keys):
# for key in keys:
# try:
# dct = dct[key]
# except (KeyError, TypeError):
# return None
# return dct

def get_nested_value(dct, keys):
'''
keys: ["k1", "k2", ...]匹配一组， [["k1", "k2", ...], [], ...]匹配多组情况
'''
value = None
for key in keys:
try:
dct = dct[key]
if isinstance(key, list):
value = get_nested_value(dct, key)
if value:
break
else:
dct = dct[key]
except (KeyError, TypeError):
return None
return dct
dct = None
break

return value if value else dct


class MessageSender(Thread):

Expand Down
Loading