nixd/Nix: promote nested namespace nix::nixd -> nixd

nix-community · Aug 11, 2023 · b8d6205 · b8d6205
1 parent e943f4b
commit b8d6205
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/nixd/include/nixd/Nix/Option.h b/nixd/include/nixd/Nix/Option.h
@@ -5,7 +5,7 @@
 #include <optional>
 #include <string>
 
-namespace nix::nixd {
+namespace nixd {
 struct OptionInfo {
   std::optional<std::string> Type;
   std::optional<std::string> Description;
@@ -15,4 +15,4 @@ struct OptionInfo {
 };
 
 OptionInfo optionInfo(nix::EvalState &State, nix::Value &V);
-} // namespace nix::nixd
+} // namespace nixd
diff --git a/nixd/include/nixd/Nix/Value.h b/nixd/include/nixd/Nix/Value.h
@@ -3,15 +3,15 @@
 #include <nix/attr-path.hh>
 #include <nix/eval.hh>
 
-namespace nix::nixd {
+namespace nixd {
 
-bool isOption(EvalState &State, Value &V);
+bool isOption(nix::EvalState &State, nix::Value &V);
 
-bool isDerivation(EvalState &State, Value &V);
+bool isDerivation(nix::EvalState &State, nix::Value &V);
 
 std::optional<std::string> attrPathStr(nix::EvalState &State, nix::Value &V,
                                        const std::string &AttrPath) noexcept;
 
 extern int PrintDepth;
 
-} // namespace nix::nixd
+} // namespace nixd
diff --git a/nixd/lib/Nix/Option.cpp b/nixd/lib/Nix/Option.cpp
@@ -6,7 +6,7 @@
 
 #include <llvm/Support/FormatVariadic.h>
 
-namespace nix::nixd {
+namespace nixd {
 
 OptionInfo optionInfo(nix::EvalState &State, nix::Value &V) {
   OptionInfo Info;
@@ -41,4 +41,4 @@ std::string OptionInfo::mdDoc() {
                        Example, Description);
 }
 
-} // namespace nix::nixd
+} // namespace nixd
diff --git a/nixd/lib/Nix/Value.cpp b/nixd/lib/Nix/Value.cpp
@@ -3,21 +3,21 @@
 #include <nix/eval.hh>
 #include <nix/print.hh>
 
-namespace nix::nixd {
+namespace nixd {
 
-bool isOption(EvalState &State, Value &V) {
-  State.forceValue(V, noPos);
-  if (V.type() != ValueType::nAttrs)
+bool isOption(nix::EvalState &State, nix::Value &V) {
+  State.forceValue(V, nix::noPos);
+  if (V.type() != nix::ValueType::nAttrs)
     return false;
 
   // https://github.com/NixOS/nixpkgs/blob/58ca986543b591a8269cbce3328293ca8d64480f/lib/options.nix#L89
   auto S = attrPathStr(State, V, "_type");
   return S && S.value() == "option";
 };
 
-bool isDerivation(EvalState &State, Value &V) {
-  State.forceValue(V, noPos);
-  if (V.type() != ValueType::nAttrs)
+bool isDerivation(nix::EvalState &State, nix::Value &V) {
+  State.forceValue(V, nix::noPos);
+  if (V.type() != nix::ValueType::nAttrs)
     return false;
 
   // Derivations has a special attribute "type" == "derivation"
@@ -41,7 +41,7 @@ std::optional<std::string> attrPathStr(nix::EvalState &State, nix::Value &V,
 
 int PrintDepth;
 
-} // namespace nix::nixd
+} // namespace nixd
 
 namespace nix {
 

diff --git a/nixd/lib/Server/EvalWorker.cpp b/nixd/lib/Server/EvalWorker.cpp
@@ -94,8 +94,8 @@ void EvalWorker::onDefinition(
         // to the location which defines the package.
         try {
           auto V = AST->getValueEval(Node, *State);
-          if (nix::nixd::isDerivation(*State, V)) {
-            if (auto S = nix::nixd::attrPathStr(*State, V, "meta.position")) {
+          if (isDerivation(*State, V)) {
+            if (auto S = attrPathStr(*State, V, "meta.position")) {
               llvm::StringRef PositionStr = S.value();
               auto [Path, LineStr] = PositionStr.split(':');
               int Line;
@@ -142,7 +142,7 @@ void EvalWorker::onHover(const lspserver::TextDocumentPositionParams &Params,
         try {
           auto Value = AST->getValueEval(Node, *IER->Session->getState());
           std::stringstream Res{};
-          nix::nixd::PrintDepth = 3;
+          PrintDepth = 3;
           Value.print(IER->Session->getState()->symbols, Res);
           HoverText =
               llvm::formatv("## {0} \n Value: `{1}`", ExprName, Res.str());

diff --git a/nixd/lib/Server/OptionWorker.cpp b/nixd/lib/Server/OptionWorker.cpp
@@ -106,7 +106,6 @@ void OptionWorker::onEvalOptionSet(
 void OptionWorker::onCompletion(const ipc::AttrPathParams &Params,
                                 lspserver::Callback<llvm::json::Value> Reply) {
   using namespace lspserver;
-  using namespace nix::nixd;
   ReplyRAII<CompletionList> RR(std::move(Reply));
 
   if (!OptionAttrSet)