Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 15:45:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix completion for items with underscores.

Browse Source
This commit is contained in:
Jacob Dufault 2017-06-19 23:31:34 -07:00
parent 36ee8bec47
commit 8dd751a70f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/working_files.cc
View File

@ -222,7 +222,7 @@ lsPosition WorkingFile::FindStableCompletionSource(lsPosition position, bool* is
while (offset > 0) { while (offset > 0) {
char c = buffer_content[offset - 1]; char c = buffer_content[offset - 1];
if (!isalnum(c)) { if (!isalnum(c) && c != '_') {
// Global completion is everything except for dot (.), arrow (->), and // Global completion is everything except for dot (.), arrow (->), and
// double colon (::) // double colon (::)
if (c == '.') if (c == '.')
@ -421,4 +421,18 @@ TEST_CASE("existing completion") {
REQUIRE(existing_completion == "asdf"); REQUIRE(existing_completion == "asdf");
} }
TEST_CASE("existing completion underscore") {
// TODO: remove trailing space in ABC_DEF. Lexing doesn't work correctly if done at the end of input.
WorkingFile f("foo.cc", "ABC_DEF ");
bool is_global_completion;
std::string existing_completion;
f.FindStableCompletionSource(CharPos(f, 'C'), &is_global_completion, &existing_completion);
REQUIRE(existing_completion == "AB");
f.FindStableCompletionSource(CharPos(f, '_'), &is_global_completion, &existing_completion);
REQUIRE(existing_completion == "ABC");
f.FindStableCompletionSource(CharPos(f, 'D'), &is_global_completion, &existing_completion);
REQUIRE(existing_completion == "ABC_");
}
TEST_SUITE_END(); TEST_SUITE_END();