forked from OSchip/llvm-project
[clangd] Put inacessible items to the end of completion list.
Reviewers: bkramer, krasimir Reviewed By: krasimir Subscribers: klimek, cfe-commits Differential Revision: https://reviews.llvm.org/D38077 llvm-svn: 313759
This commit is contained in:
Ilya Biryukov
parent
6a140234ed
commit
77f61badf4
|
|
@ -368,13 +368,39 @@ private:
|
|||
}
|
||||
}
|
||||
|
||||
void FillSortText(const CodeCompletionString &CCS,
|
||||
CompletionItem &Item) const {
|
||||
static int GetSortPriority(const CodeCompletionString &CCS) {
|
||||
int Score = CCS.getPriority();
|
||||
// Fill in the sortText of the CompletionItem.
|
||||
assert(CCS.getPriority() < 99999 && "Expecting code completion result "
|
||||
"priority to have at most 5-digits");
|
||||
assert(Score <= 99999 && "Expecting code completion result "
|
||||
"priority to have at most 5-digits");
|
||||
|
||||
const int Penalty = 100000;
|
||||
switch (static_cast<CXAvailabilityKind>(CCS.getAvailability())) {
|
||||
case CXAvailability_Available:
|
||||
// No penalty.
|
||||
break;
|
||||
case CXAvailability_Deprecated:
|
||||
Score += Penalty;
|
||||
break;
|
||||
case CXAvailability_NotAccessible:
|
||||
Score += 2 * Penalty;
|
||||
break;
|
||||
case CXAvailability_NotAvailable:
|
||||
Score += 3 * Penalty;
|
||||
break;
|
||||
}
|
||||
|
||||
return Score;
|
||||
}
|
||||
|
||||
static void FillSortText(const CodeCompletionString &CCS,
|
||||
CompletionItem &Item) {
|
||||
int Priority = GetSortPriority(CCS);
|
||||
// Fill in the sortText of the CompletionItem.
|
||||
assert(Priority <= 999999 &&
|
||||
"Expecting sort priority to have at most 6-digits");
|
||||
llvm::raw_string_ostream(Item.sortText)
|
||||
<< llvm::format("%05d%s", CCS.getPriority(), Item.filterText.c_str());
|
||||
<< llvm::format("%06d%s", Priority, Item.filterText.c_str());
|
||||
}
|
||||
|
||||
std::vector<CompletionItem> &Items;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Content-Length: 146
|
|||
# Test authority-less URI
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":1,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
|
||||
Content-Length: 172
|
||||
|
|
@ -25,7 +25,7 @@ Content-Length: 172
|
|||
# Test params parsing in the presence of a 1.x-compatible client (inlined "uri")
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":2,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
Content-Length: 44
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
# RUN: clangd -run-synchronously < %s | FileCheck %s
|
||||
# It is absolutely vital that this file has CRLF line endings.
|
||||
#
|
||||
|
||||
Content-Length: 127
|
||||
|
||||
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
|
||||
|
||||
Content-Length: 312
|
||||
|
||||
{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"file:///main.cpp","languageId":"cpp","version":1,"text":"class Foo {\npublic:\n void pub();\n\nprotected:\n void prot();\n\nprivate:\n void priv();\n};\n\nvoid Foo::pub() {\n this->\n}\n\nvoid test() {\n Foo f;\n f.\n}"}}}
|
||||
|
||||
Content-Length: 151
|
||||
|
||||
{"jsonrpc":"2.0","id":2,"method":"textDocument/completion","params":{"textDocument":{"uri":"file:///main.cpp"},"position":{"line":12,"character":8}}}
|
||||
# The order of results returned by codeComplete seems to be
|
||||
# nondeterministic, so we check regardless of order.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":2,"result":[
|
||||
# CHECK-DAG: {"label":"pub()","kind":2,"detail":"void","sortText":"000034pub","filterText":"pub","insertText":"pub","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"prot()","kind":2,"detail":"void","sortText":"000034prot","filterText":"prot","insertText":"prot","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"priv()","kind":2,"detail":"void","sortText":"000034priv","filterText":"priv","insertText":"priv","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
|
||||
Content-Length: 151
|
||||
|
||||
{"jsonrpc":"2.0","id":3,"method":"textDocument/completion","params":{"textDocument":{"uri":"file:///main.cpp"},"position":{"line":17,"character":4}}}
|
||||
# CHECK: {"jsonrpc":"2.0","id":3,"result":[
|
||||
# CHECK-DAG: {"label":"pub()","kind":2,"detail":"void","sortText":"000034pub","filterText":"pub","insertText":"pub","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"prot()","kind":2,"detail":"void","sortText":"200034prot","filterText":"prot","insertText":"prot","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"priv()","kind":2,"detail":"void","sortText":"200034priv","filterText":"priv","insertText":"priv","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
|
||||
Content-Length: 58
|
||||
|
||||
{"jsonrpc":"2.0","id":4,"method":"shutdown","params":null}
|
||||
|
|
@ -16,12 +16,12 @@ Content-Length: 148
|
|||
# nondeterministic, so we check regardless of order.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":1,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"00035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"00035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"00034operator=","filterText":"operator=","insertText":"operator=(${1:const fake &})","insertTextFormat":2}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"00034~fake","filterText":"~fake","insertText":"~fake()","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"00035f","filterText":"f","insertText":"f(${1:int i}, ${2:const float f})","insertTextFormat":2}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"000035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"000035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"000034operator=","filterText":"operator=","insertText":"operator=(${1:const fake &})","insertTextFormat":2}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"000034~fake","filterText":"~fake","insertText":"~fake()","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"000035f","filterText":"f","insertText":"f(${1:int i}, ${2:const float f})","insertTextFormat":2}
|
||||
# CHECK: ]}
|
||||
Content-Length: 148
|
||||
|
||||
|
|
@ -29,12 +29,12 @@ Content-Length: 148
|
|||
# Repeat the completion request, expect the same results.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":2,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"00035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"00035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"00034operator=","filterText":"operator=","insertText":"operator=(${1:const fake &})","insertTextFormat":2}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"00034~fake","filterText":"~fake","insertText":"~fake()","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"00035f","filterText":"f","insertText":"f(${1:int i}, ${2:const float f})","insertTextFormat":2}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"000035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"000035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"000034operator=","filterText":"operator=","insertText":"operator=(${1:const fake &})","insertTextFormat":2}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"000034~fake","filterText":"~fake","insertText":"~fake()","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"000035f","filterText":"f","insertText":"f(${1:int i}, ${2:const float f})","insertTextFormat":2}
|
||||
# CHECK: ]}
|
||||
# Update the source file and check for completions again.
|
||||
Content-Length: 226
|
||||
|
|
@ -47,7 +47,7 @@ Content-Length: 148
|
|||
# Repeat the completion request, expect the same results.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":3,"result":[
|
||||
# CHECK-DAG: {"label":"func()","kind":2,"detail":"int (*)(int, int)","sortText":"00034func","filterText":"func","insertText":"func()","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"func()","kind":2,"detail":"int (*)(int, int)","sortText":"000034func","filterText":"func","insertText":"func()","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
Content-Length: 44
|
||||
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ Content-Length: 148
|
|||
# nondeterministic, so we check regardless of order.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":1,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"00035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"00035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"00034operator=","filterText":"operator=","insertText":"operator=","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"00034~fake","filterText":"~fake","insertText":"~fake","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"00035f","filterText":"f","insertText":"f","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"000035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"000035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"000034operator=","filterText":"operator=","insertText":"operator=","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"000034~fake","filterText":"~fake","insertText":"~fake","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"000035f","filterText":"f","insertText":"f","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
Content-Length: 148
|
||||
|
||||
|
|
@ -29,12 +29,12 @@ Content-Length: 148
|
|||
# Repeat the completion request, expect the same results.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":2,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"00035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"00035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"00034operator=","filterText":"operator=","insertText":"operator=","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"00034~fake","filterText":"~fake","insertText":"~fake","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"00035f","filterText":"f","insertText":"f","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"bb","kind":5,"detail":"int","sortText":"000035bb","filterText":"bb","insertText":"bb","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"ccc","kind":5,"detail":"int","sortText":"000035ccc","filterText":"ccc","insertText":"ccc","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"operator=(const fake &)","kind":2,"detail":"fake &","sortText":"000034operator=","filterText":"operator=","insertText":"operator=","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"~fake()","kind":4,"detail":"void","sortText":"000034~fake","filterText":"~fake","insertText":"~fake","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"f(int i, const float f) const","kind":2,"detail":"int","sortText":"000035f","filterText":"f","insertText":"f","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
# Update the source file and check for completions again.
|
||||
Content-Length: 226
|
||||
|
|
@ -47,7 +47,7 @@ Content-Length: 148
|
|||
# Repeat the completion request, expect the same results.
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":3,"result":[
|
||||
# CHECK-DAG: {"label":"func()","kind":2,"detail":"int (*)(int, int)","sortText":"00034func","filterText":"func","insertText":"func","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"func()","kind":2,"detail":"int (*)(int, int)","sortText":"000034func","filterText":"func","insertText":"func","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
Content-Length: 44
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Content-Length: 146
|
|||
# Test message with Content-Type before Content-Length
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":1,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
|
||||
X-Test: Testing
|
||||
|
|
@ -50,7 +50,7 @@ Content-Length: 146
|
|||
# Test message with duplicate Content-Length headers
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":3,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
# STDERR: Warning: Duplicate Content-Length header received. The previous value for this message (10) was ignored.
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ Content-Length: 146
|
|||
# Test message with Content-Type before Content-Length
|
||||
#
|
||||
# CHECK: {"jsonrpc":"2.0","id":5,"result":[
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"00035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK-DAG: {"label":"a","kind":5,"detail":"int","sortText":"000035a","filterText":"a","insertText":"a","insertTextFormat":1}
|
||||
# CHECK: ]}
|
||||
|
||||
Content-Length: 1024
|
||||
|
|
|
|||
Loading…
Reference in New Issue