Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions src/clangd-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,17 @@ export class ClangdContext implements vscode.Disposable {
let items = (!list ? [] : Array.isArray(list) ? list : list.items);
items = items.map(item => {
// Gets the prefix used by VSCode when doing fuzzymatch.
let prefix = document.getText(
new vscode.Range((item.range as vscode.Range).start, position))
// item.range is either a Range or {inserting, replacing} (see
// CompletionItem in the VS Code API); narrow before using.
let prefix = '';
if (item.range) {
const start = item.range instanceof vscode.Range
? item.range.start
: item.range.inserting.start;
prefix = document.getText(new vscode.Range(start, position));
}
if (prefix)
item.filterText = prefix + '_' + item.filterText;
item.filterText = prefix + '_' + item.filterText;
// Workaround for https://github.com/clangd/vscode-clangd/issues/357
// clangd's used of commit-characters was well-intentioned, but
// overall UX is poor. Due to vscode-languageclient bugs, we didn't
Expand Down