From 7b7c095b37e85ca3a8f55eff1c3d9643d467b8e0 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 25 Apr 2023 10:43:29 -0400 Subject: Dictionary using lowerCamel (#2835) * #include an absolute path didn't work - because paths were taken to always be relative. * WIP lowerCamel Dictionary. * WIP more lowerCamel fixes for Dictionary. * Add/Remove/Clear * GetValue/Contains * Fix tabs in dictionary. Count -> getCount * Fix fields with caps. * Key -> key Value -> value Use m_ for members where appropriate. Use lowerCamel in linked list. * Some small fixes/improvements to Dictionary. * Kick CI. --- source/slang/slang-language-server-completion.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source/slang/slang-language-server-completion.cpp') diff --git a/source/slang/slang-language-server-completion.cpp b/source/slang/slang-language-server-completion.cpp index 92a0b3860..9736bd889 100644 --- a/source/slang/slang-language-server-completion.cpp +++ b/source/slang/slang-language-server-completion.cpp @@ -202,7 +202,7 @@ List CompletionContext::gatherFi if (item.label.getLength()) { auto key = String(item.kind) + item.label; - if (context->itemSet.Add(key)) + if (context->itemSet.add(key)) { item.detail = Path::combine(context->path, String(name)); Path::getCanonical(item.detail, item.detail); @@ -483,7 +483,7 @@ List CompletionContext::collectMembersAn continue; if (item.label.startsWith("$")) continue; - if (!deduplicateSet.Add(item.label)) + if (!deduplicateSet.add(item.label)) continue; if (as(member)) @@ -536,7 +536,7 @@ List CompletionContext::collectMembersAn { for (auto keyword : kDeclKeywords) { - if (!deduplicateSet.Add(keyword)) + if (!deduplicateSet.add(keyword)) continue; LanguageServerProtocol::CompletionItem item; item.label = keyword; @@ -549,7 +549,7 @@ List CompletionContext::collectMembersAn { for (auto keyword : kStmtKeywords) { - if (!deduplicateSet.Add(keyword)) + if (!deduplicateSet.add(keyword)) continue; LanguageServerProtocol::CompletionItem item; item.label = keyword; @@ -564,7 +564,7 @@ List CompletionContext::collectMembersAn if (!def.name) continue; auto& text = def.name->text; - if (!deduplicateSet.Add(text)) + if (!deduplicateSet.add(text)) continue; LanguageServerProtocol::CompletionItem item; item.label = text; @@ -629,11 +629,11 @@ List CompletionContext::createSwizzleCan item.data = 0; item.detail = typeStr; item.kind = LanguageServerProtocol::kCompletionItemKindVariable; - nameSB.Clear(); + nameSB.clear(); nameSB << "_m" << i << j; item.label = nameSB.ToString(); result.add(item); - nameSB.Clear(); + nameSB.clear(); nameSB << "_" << i + 1 << j + 1; item.label = nameSB.ToString(); result.add(item); -- cgit v1.2.3