nixd/Sema: address comments in nix-community#242

Link: nix-community#242
a-kenji · Nov 3, 2023 · 87d8642 · 87d8642
1 parent ae4d95e
commit 87d8642
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/nixd/lib/Sema/CompletionBuilder.cpp b/nixd/lib/Sema/CompletionBuilder.cpp
@@ -121,8 +121,13 @@ void CompletionBuilder::addEnv(const EvalAST &AST, nix::EvalState &State,
 void CompletionBuilder::addStaticEnv(const nix::SymbolTable &STable,
                                      const nix::StaticEnv &SEnv) {
   for (auto [Symbol, Displ] : SEnv.vars) {
+    std::string Name = STable[Symbol];
+
+    if (Name.starts_with("__"))
+      continue;
+
     CompletionItem R;
-    R.label = STable[Symbol];
+    R.label = std::move(Name);
     R.kind = CompletionItemKind::Constant;
     addItem(std::move(R));
   }

diff --git a/nixd/lib/Server/EvalWorker.cpp b/nixd/lib/Server/EvalWorker.cpp
@@ -7,10 +7,11 @@
 #include "nixd/Support/String.h"
 
 #include "lspserver/LSPServer.h"
-#include "nixexpr.hh"
 
 #include <llvm/ADT/StringRef.h>
 
+#include <nix/nixexpr.hh>
+
 namespace nixd {
 
 EvalWorker::EvalWorker(std::unique_ptr<lspserver::InboundPort> In,