From 4f0362ee6b25c82ff66ed31f99f41fdc0be3df7f Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Mon, 8 Apr 2024 22:36:56 +0800 Subject: [PATCH] nixd: refactor into library-like structure (#387) --- .../nixd/Controller}/Controller.h | 2 +- .../nixd/Controller}/EvalClient.h | 8 +-- .../src => include/nixd/Controller}/NixTU.h | 2 +- .../src => include/nixd/Eval}/EvalProvider.h | 2 +- .../rpc => include/nixd/Protocol}/Protocol.h | 0 .../nixd/Support}/AutoCloseFD.h | 0 .../nixd/Support}/AutoHUPPID.h | 0 .../nixd/Support}/AutoRemoveShm.h | 0 .../util => include/nixd/Support}/ForkPiped.h | 0 .../nixd/Support}/OwnedRegion.h | 0 .../util => include/nixd/Support}/PipedProc.h | 0 .../src => lib/Controller}/CodeAction.cpp | 3 +- .../nixd/src => lib/Controller}/Convert.cpp | 0 .../nixd/src => lib/Controller}/Convert.h | 0 .../src => lib/Controller}/Diagnostics.cpp | 3 +- .../src => lib/Controller}/EvalClient.cpp | 5 +- .../nixd/src => lib/Controller}/Hover.cpp | 3 +- .../nixd/src => lib/Controller}/LifeTime.cpp | 7 +- .../nixd/src => lib/Controller}/Support.cpp | 7 +- .../Controller}/TextDocumentSync.cpp | 2 +- .../src => lib/Eval}/EvalProvider.cpp | 8 +-- nixd/lib/Eval/Main.cpp | 0 .../{librpc/src => lib/Protocol}/Protocol.cpp | 4 +- .../src => lib/Support}/AutoCloseFD.cpp | 2 +- .../src => lib/Support}/AutoRemoveShm.cpp | 2 +- .../src => lib/Support}/ForkPiped.cpp | 2 +- nixd/librpc/meson.build | 24 ------- nixd/librpc/test/Transport.cpp | 12 ---- nixd/meson.build | 65 +++++++++++++++++-- nixd/nix-node-eval/README.md | 3 - nixd/nix-node-eval/meson.build | 21 ------ nixd/tools/meson.build | 1 - .../src/Main.cpp => tools/nix-node-eval.cpp} | 2 +- nixd/tools/{nixd/src/Main.cpp => nixd.cpp} | 2 +- nixd/tools/nixd/meson.build | 31 --------- 35 files changed, 91 insertions(+), 132 deletions(-) rename nixd/{tools/nixd/src => include/nixd/Controller}/Controller.h (98%) rename nixd/{tools/nixd/src => include/nixd/Controller}/EvalClient.h (93%) rename nixd/{tools/nixd/src => include/nixd/Controller}/NixTU.h (95%) rename nixd/{nix-node-eval/src => include/nixd/Eval}/EvalProvider.h (95%) rename nixd/{librpc/include/nixd/rpc => include/nixd/Protocol}/Protocol.h (100%) rename nixd/{libutil/include/nixd/util => include/nixd/Support}/AutoCloseFD.h (100%) rename nixd/{libutil/include/nixd/util => include/nixd/Support}/AutoHUPPID.h (100%) rename nixd/{libutil/include/nixd/util => include/nixd/Support}/AutoRemoveShm.h (100%) rename nixd/{libutil/include/nixd/util => include/nixd/Support}/ForkPiped.h (100%) rename nixd/{libutil/include/nixd/util => include/nixd/Support}/OwnedRegion.h (100%) rename nixd/{libutil/include/nixd/util => include/nixd/Support}/PipedProc.h (100%) rename nixd/{tools/nixd/src => lib/Controller}/CodeAction.cpp (97%) rename nixd/{tools/nixd/src => lib/Controller}/Convert.cpp (100%) rename nixd/{tools/nixd/src => lib/Controller}/Convert.h (100%) rename nixd/{tools/nixd/src => lib/Controller}/Diagnostics.cpp (98%) rename nixd/{tools/nixd/src => lib/Controller}/EvalClient.cpp (95%) rename nixd/{tools/nixd/src => lib/Controller}/Hover.cpp (96%) rename nixd/{tools/nixd/src => lib/Controller}/LifeTime.cpp (93%) rename nixd/{tools/nixd/src => lib/Controller}/Support.cpp (97%) rename nixd/{tools/nixd/src => lib/Controller}/TextDocumentSync.cpp (97%) rename nixd/{nix-node-eval/src => lib/Eval}/EvalProvider.cpp (93%) create mode 100644 nixd/lib/Eval/Main.cpp rename nixd/{librpc/src => lib/Protocol}/Protocol.cpp (93%) rename nixd/{libutil/src => lib/Support}/AutoCloseFD.cpp (93%) rename nixd/{libutil/src => lib/Support}/AutoRemoveShm.cpp (90%) rename nixd/{libutil/src => lib/Support}/ForkPiped.cpp (95%) delete mode 100644 nixd/librpc/meson.build delete mode 100644 nixd/librpc/test/Transport.cpp delete mode 100644 nixd/nix-node-eval/README.md delete mode 100644 nixd/nix-node-eval/meson.build delete mode 100644 nixd/tools/meson.build rename nixd/{nix-node-eval/src/Main.cpp => tools/nix-node-eval.cpp} (91%) rename nixd/tools/{nixd/src/Main.cpp => nixd.cpp} (98%) delete mode 100644 nixd/tools/nixd/meson.build diff --git a/nixd/tools/nixd/src/Controller.h b/nixd/include/nixd/Controller/Controller.h similarity index 98% rename from nixd/tools/nixd/src/Controller.h rename to nixd/include/nixd/Controller/Controller.h index 2033169a1..8caf2c548 100644 --- a/nixd/tools/nixd/src/Controller.h +++ b/nixd/include/nixd/Controller/Controller.h @@ -60,7 +60,7 @@ class Controller : public lspserver::LSPServer { Controller(std::unique_ptr In, std::unique_ptr Out); - ~Controller() { Pool.join(); } + ~Controller() override { Pool.join(); } void setLitTest(bool LitTest) { this->LitTest = LitTest; } diff --git a/nixd/tools/nixd/src/EvalClient.h b/nixd/include/nixd/Controller/EvalClient.h similarity index 93% rename from nixd/tools/nixd/src/EvalClient.h rename to nixd/include/nixd/Controller/EvalClient.h index b93c94986..43f50b160 100644 --- a/nixd/tools/nixd/src/EvalClient.h +++ b/nixd/include/nixd/Controller/EvalClient.h @@ -1,8 +1,8 @@ #pragma once -#include "nixd/rpc/Protocol.h" +#include "nixd/Protocol/Protocol.h" -#include "nixd/util/PipedProc.h" +#include "nixd/Support/PipedProc.h" #include @@ -23,8 +23,6 @@ class EvalClient : public lspserver::LSPServer { EvalClient(std::unique_ptr In, std::unique_ptr Out); - virtual ~EvalClient() = default; - void onReady(const int &Flags) { lspserver::log( "nix-node-eval({0}) reported it's ready for processing requests", @@ -54,7 +52,7 @@ class OwnedEvalClient : public EvalClient { util::PipedProc &proc() { return *Proc; } - ~OwnedEvalClient() { + ~OwnedEvalClient() override { closeInbound(); Input.join(); } diff --git a/nixd/tools/nixd/src/NixTU.h b/nixd/include/nixd/Controller/NixTU.h similarity index 95% rename from nixd/tools/nixd/src/NixTU.h rename to nixd/include/nixd/Controller/NixTU.h index 1ac7d7a2b..70b0ae98c 100644 --- a/nixd/tools/nixd/src/NixTU.h +++ b/nixd/include/nixd/Controller/NixTU.h @@ -1,6 +1,6 @@ #pragma once -#include "nixd/util/OwnedRegion.h" +#include "nixd/Support/OwnedRegion.h" #include "nixf/Basic/Diagnostic.h" #include "nixf/Basic/Nodes/Basic.h" diff --git a/nixd/nix-node-eval/src/EvalProvider.h b/nixd/include/nixd/Eval/EvalProvider.h similarity index 95% rename from nixd/nix-node-eval/src/EvalProvider.h rename to nixd/include/nixd/Eval/EvalProvider.h index b3722a639..ef755d5f9 100644 --- a/nixd/nix-node-eval/src/EvalProvider.h +++ b/nixd/include/nixd/Eval/EvalProvider.h @@ -1,6 +1,6 @@ #pragma once -#include "nixd/rpc/Protocol.h" +#include "nixd/Protocol/Protocol.h" #include #include diff --git a/nixd/librpc/include/nixd/rpc/Protocol.h b/nixd/include/nixd/Protocol/Protocol.h similarity index 100% rename from nixd/librpc/include/nixd/rpc/Protocol.h rename to nixd/include/nixd/Protocol/Protocol.h diff --git a/nixd/libutil/include/nixd/util/AutoCloseFD.h b/nixd/include/nixd/Support/AutoCloseFD.h similarity index 100% rename from nixd/libutil/include/nixd/util/AutoCloseFD.h rename to nixd/include/nixd/Support/AutoCloseFD.h diff --git a/nixd/libutil/include/nixd/util/AutoHUPPID.h b/nixd/include/nixd/Support/AutoHUPPID.h similarity index 100% rename from nixd/libutil/include/nixd/util/AutoHUPPID.h rename to nixd/include/nixd/Support/AutoHUPPID.h diff --git a/nixd/libutil/include/nixd/util/AutoRemoveShm.h b/nixd/include/nixd/Support/AutoRemoveShm.h similarity index 100% rename from nixd/libutil/include/nixd/util/AutoRemoveShm.h rename to nixd/include/nixd/Support/AutoRemoveShm.h diff --git a/nixd/libutil/include/nixd/util/ForkPiped.h b/nixd/include/nixd/Support/ForkPiped.h similarity index 100% rename from nixd/libutil/include/nixd/util/ForkPiped.h rename to nixd/include/nixd/Support/ForkPiped.h diff --git a/nixd/libutil/include/nixd/util/OwnedRegion.h b/nixd/include/nixd/Support/OwnedRegion.h similarity index 100% rename from nixd/libutil/include/nixd/util/OwnedRegion.h rename to nixd/include/nixd/Support/OwnedRegion.h diff --git a/nixd/libutil/include/nixd/util/PipedProc.h b/nixd/include/nixd/Support/PipedProc.h similarity index 100% rename from nixd/libutil/include/nixd/util/PipedProc.h rename to nixd/include/nixd/Support/PipedProc.h diff --git a/nixd/tools/nixd/src/CodeAction.cpp b/nixd/lib/Controller/CodeAction.cpp similarity index 97% rename from nixd/tools/nixd/src/CodeAction.cpp rename to nixd/lib/Controller/CodeAction.cpp index 300d87399..2d82f6364 100644 --- a/nixd/tools/nixd/src/CodeAction.cpp +++ b/nixd/lib/Controller/CodeAction.cpp @@ -3,9 +3,10 @@ /// [Code Action]: /// https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeAction -#include "Controller.h" #include "Convert.h" +#include "nixd/Controller/Controller.h" + #include namespace nixd { diff --git a/nixd/tools/nixd/src/Convert.cpp b/nixd/lib/Controller/Convert.cpp similarity index 100% rename from nixd/tools/nixd/src/Convert.cpp rename to nixd/lib/Controller/Convert.cpp diff --git a/nixd/tools/nixd/src/Convert.h b/nixd/lib/Controller/Convert.h similarity index 100% rename from nixd/tools/nixd/src/Convert.h rename to nixd/lib/Controller/Convert.h diff --git a/nixd/tools/nixd/src/Diagnostics.cpp b/nixd/lib/Controller/Diagnostics.cpp similarity index 98% rename from nixd/tools/nixd/src/Diagnostics.cpp rename to nixd/lib/Controller/Diagnostics.cpp index c186600d7..d5ec40276 100644 --- a/nixd/tools/nixd/src/Diagnostics.cpp +++ b/nixd/lib/Controller/Diagnostics.cpp @@ -3,9 +3,10 @@ /// [PublishDiagnostics Notification]: /// https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_publishDiagnostics -#include "Controller.h" #include "Convert.h" +#include "nixd/Controller/Controller.h" + namespace nixd { using namespace llvm::json; diff --git a/nixd/tools/nixd/src/EvalClient.cpp b/nixd/lib/Controller/EvalClient.cpp similarity index 95% rename from nixd/tools/nixd/src/EvalClient.cpp rename to nixd/lib/Controller/EvalClient.cpp index bc571b5cf..3fd17c5d4 100644 --- a/nixd/tools/nixd/src/EvalClient.cpp +++ b/nixd/lib/Controller/EvalClient.cpp @@ -1,8 +1,7 @@ #include "nixd-config.h" -#include "EvalClient.h" - -#include "nixd/util/ForkPiped.h" +#include "nixd/Controller/EvalClient.h" +#include "nixd/Support/ForkPiped.h" #include #include diff --git a/nixd/tools/nixd/src/Hover.cpp b/nixd/lib/Controller/Hover.cpp similarity index 96% rename from nixd/tools/nixd/src/Hover.cpp rename to nixd/lib/Controller/Hover.cpp index ad7701add..4f14b21de 100644 --- a/nixd/tools/nixd/src/Hover.cpp +++ b/nixd/lib/Controller/Hover.cpp @@ -3,9 +3,10 @@ /// [Hover Request]: /// https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_hover -#include "Controller.h" #include "Convert.h" +#include "nixd/Controller/Controller.h" + #include #include diff --git a/nixd/tools/nixd/src/LifeTime.cpp b/nixd/lib/Controller/LifeTime.cpp similarity index 93% rename from nixd/tools/nixd/src/LifeTime.cpp rename to nixd/lib/Controller/LifeTime.cpp index 35dce973c..0ce7b6166 100644 --- a/nixd/tools/nixd/src/LifeTime.cpp +++ b/nixd/lib/Controller/LifeTime.cpp @@ -5,10 +5,9 @@ #include "nixd-config.h" -#include "Controller.h" -#include "EvalClient.h" - -#include "nixd/util/PipedProc.h" +#include "nixd/Controller/Controller.h" +#include "nixd/Controller/EvalClient.h" +#include "nixd/Support/PipedProc.h" #include diff --git a/nixd/tools/nixd/src/Support.cpp b/nixd/lib/Controller/Support.cpp similarity index 97% rename from nixd/tools/nixd/src/Support.cpp rename to nixd/lib/Controller/Support.cpp index 713c4009b..9f1509cb0 100644 --- a/nixd/tools/nixd/src/Support.cpp +++ b/nixd/lib/Controller/Support.cpp @@ -1,7 +1,6 @@ -#include "Controller.h" - -#include "nixd/rpc/Protocol.h" -#include "nixd/util/OwnedRegion.h" +#include "nixd/Controller/Controller.h" +#include "nixd/Protocol/Protocol.h" +#include "nixd/Support/OwnedRegion.h" #include "nixf/Basic/Diagnostic.h" #include "nixf/Bytecode/Write.h" diff --git a/nixd/tools/nixd/src/TextDocumentSync.cpp b/nixd/lib/Controller/TextDocumentSync.cpp similarity index 97% rename from nixd/tools/nixd/src/TextDocumentSync.cpp rename to nixd/lib/Controller/TextDocumentSync.cpp index c5770c2d0..23b6a09a1 100644 --- a/nixd/tools/nixd/src/TextDocumentSync.cpp +++ b/nixd/lib/Controller/TextDocumentSync.cpp @@ -1,7 +1,7 @@ /// \file /// \brief Implementation of the [text document /// sync](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_synchronization). -#include "Controller.h" +#include "nixd/Controller/Controller.h" #include "lspserver/SourceCode.h" diff --git a/nixd/nix-node-eval/src/EvalProvider.cpp b/nixd/lib/Eval/EvalProvider.cpp similarity index 93% rename from nixd/nix-node-eval/src/EvalProvider.cpp rename to nixd/lib/Eval/EvalProvider.cpp index ee2717138..386347946 100644 --- a/nixd/nix-node-eval/src/EvalProvider.cpp +++ b/nixd/lib/Eval/EvalProvider.cpp @@ -1,6 +1,5 @@ -#include "EvalProvider.h" - -#include "nixd/rpc/Protocol.h" +#include "nixd/Eval/EvalProvider.h" +#include "nixd/Protocol/Protocol.h" #include #include @@ -31,8 +30,7 @@ using namespace rpc; EvalProvider::EvalProvider(std::unique_ptr In, std::unique_ptr Out) : lspserver::LSPServer(std::move(In), std::move(Out)), - State(std::unique_ptr( - new nix::EvalState{{}, nix::openStore("dummy://")})) { + State(new nix::EvalState{{}, nix::openStore()}) { Registry.addMethod("exprValue", this, &EvalProvider::onExprValue); Registry.addNotification("registerBC", this, &EvalProvider::onRegisterBC); diff --git a/nixd/lib/Eval/Main.cpp b/nixd/lib/Eval/Main.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/nixd/librpc/src/Protocol.cpp b/nixd/lib/Protocol/Protocol.cpp similarity index 93% rename from nixd/librpc/src/Protocol.cpp rename to nixd/lib/Protocol/Protocol.cpp index 9ea324620..a0637efab 100644 --- a/nixd/librpc/src/Protocol.cpp +++ b/nixd/lib/Protocol/Protocol.cpp @@ -1,12 +1,10 @@ -#include "nixd/rpc/Protocol.h" +#include "nixd/Protocol/Protocol.h" #include #include namespace nixd::rpc { -using bc::readBytecode; -using bc::writeBytecode; using namespace llvm::json; Value toJSON(const RegisterBCParams &Params) { diff --git a/nixd/libutil/src/AutoCloseFD.cpp b/nixd/lib/Support/AutoCloseFD.cpp similarity index 93% rename from nixd/libutil/src/AutoCloseFD.cpp rename to nixd/lib/Support/AutoCloseFD.cpp index 0ab624cbc..604c5b490 100644 --- a/nixd/libutil/src/AutoCloseFD.cpp +++ b/nixd/lib/Support/AutoCloseFD.cpp @@ -1,4 +1,4 @@ -#include "nixd/util/AutoCloseFD.h" +#include "nixd/Support/AutoCloseFD.h" #include diff --git a/nixd/libutil/src/AutoRemoveShm.cpp b/nixd/lib/Support/AutoRemoveShm.cpp similarity index 90% rename from nixd/libutil/src/AutoRemoveShm.cpp rename to nixd/lib/Support/AutoRemoveShm.cpp index b54c6629d..a59eeaf89 100644 --- a/nixd/libutil/src/AutoRemoveShm.cpp +++ b/nixd/lib/Support/AutoRemoveShm.cpp @@ -1,4 +1,4 @@ -#include "nixd/util/AutoRemoveShm.h" +#include "nixd/Support/AutoRemoveShm.h" namespace nixd::util { diff --git a/nixd/libutil/src/ForkPiped.cpp b/nixd/lib/Support/ForkPiped.cpp similarity index 95% rename from nixd/libutil/src/ForkPiped.cpp rename to nixd/lib/Support/ForkPiped.cpp index eafca90c2..df68f3303 100644 --- a/nixd/libutil/src/ForkPiped.cpp +++ b/nixd/lib/Support/ForkPiped.cpp @@ -1,4 +1,4 @@ -#include "nixd/util/ForkPiped.h" +#include "nixd/Support/ForkPiped.h" #include diff --git a/nixd/librpc/meson.build b/nixd/librpc/meson.build deleted file mode 100644 index ce8552935..000000000 --- a/nixd/librpc/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -libnixdrpc_inc = include_directories('include') - -libnixdrpc_deps = [ libbc, nixd_lsp_server ] - -libnixdrpc_lib = library('nixdrpc', - 'src/Protocol.cpp', - install: true, - include_directories: libnixdrpc_inc, - dependencies: libnixdrpc_deps, -) - -libnixdrpc = declare_dependency( - include_directories: libnixdrpc_inc, - link_with: libnixdrpc_lib, - dependencies: libnixdrpc_deps, -) - -test('unit/nixd/librpc', - executable( - 'unit-nixd-librpc', - 'test/Transport.cpp', - dependencies: [ gtest_main, libnixdrpc ] - ) -) diff --git a/nixd/librpc/test/Transport.cpp b/nixd/librpc/test/Transport.cpp deleted file mode 100644 index ab31190a1..000000000 --- a/nixd/librpc/test/Transport.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include - -#include "nixd/rpc/Protocol.h" - -namespace { - -using namespace nixd::rpc; - -#define PIPE_READ 0 -#define PIPE_WRITE 1 - -} // namespace diff --git a/nixd/meson.build b/nixd/meson.build index 124fa9ea6..63ff7d6ec 100644 --- a/nixd/meson.build +++ b/nixd/meson.build @@ -1,4 +1,61 @@ -subdir('librpc') -subdir('libutil') -subdir('nix-node-eval') -subdir('tools') +libnixd_include = include_directories('include') + +libnixd_deps = [ nixd_lsp_server, nixf, llvm, nixt ] + +libnixd_lib = library( + 'nixd', + 'lib/Controller/CodeAction.cpp', + 'lib/Controller/Convert.cpp', + 'lib/Controller/Diagnostics.cpp', + 'lib/Controller/EvalClient.cpp', + 'lib/Controller/Hover.cpp', + 'lib/Controller/LifeTime.cpp', + 'lib/Controller/Support.cpp', + 'lib/Controller/TextDocumentSync.cpp', + 'lib/Eval/EvalProvider.cpp', + 'lib/Protocol/Protocol.cpp', + 'lib/Support/AutoCloseFD.cpp', + 'lib/Support/AutoRemoveShm.cpp', + 'lib/Support/ForkPiped.cpp', + dependencies: libnixd_deps, + include_directories: libnixd_include, + install: true +) + +libnixd = declare_dependency( + include_directories: libnixd_include, + link_with: libnixd_lib, + dependencies: libnixd_deps +) + +nixd = executable( + 'nixd', + 'tools/nixd.cpp', + install: true, + dependencies: libnixd +) + +regression_env = environment() + +regression_env.append('PATH', meson.current_build_dir()) +regression_env.set('MESON_BUILD_ROOT', meson.current_build_dir()) + +if lit.found() + test( + 'regression/nixd', + lit, + env: regression_env, + args: [ + '-vv', + meson.current_source_dir() + '/tools/nixd/test' + ], + depends: [ nixd ] ) +endif + + +nix_node_eval = executable( + 'nix-node-eval', + 'tools/nix-node-eval.cpp', + install: true, + dependencies: libnixd +) diff --git a/nixd/nix-node-eval/README.md b/nixd/nix-node-eval/README.md deleted file mode 100644 index af9b04446..000000000 --- a/nixd/nix-node-eval/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# nix-node-eval - -Collect per-node eval information, by using official evaluator. diff --git a/nixd/nix-node-eval/meson.build b/nixd/nix-node-eval/meson.build deleted file mode 100644 index 94e664e9c..000000000 --- a/nixd/nix-node-eval/meson.build +++ /dev/null @@ -1,21 +0,0 @@ -nixd_nix_node_eval_deps = [ libnixdrpc, nixt, libnixdutil, nixd_lsp_server ] - -nixd_nix_node_eval_lib = library( - 'nix-node-eval', - 'src/EvalProvider.cpp', - install: true, - dependencies: nixd_nix_node_eval_deps -) - -nixd_nix_node_eval_lib_dep = declare_dependency( - link_with: nixd_nix_node_eval_lib, - dependencies: nixd_nix_node_eval_deps, -) - - -nixd_nix_node_eval = executable('nix-node-eval', - 'src/Main.cpp', - install: true, - install_dir: get_option('libexecdir'), - dependencies: nixd_nix_node_eval_lib_dep -) diff --git a/nixd/tools/meson.build b/nixd/tools/meson.build deleted file mode 100644 index 60111aaab..000000000 --- a/nixd/tools/meson.build +++ /dev/null @@ -1 +0,0 @@ -subdir('nixd') diff --git a/nixd/nix-node-eval/src/Main.cpp b/nixd/tools/nix-node-eval.cpp similarity index 91% rename from nixd/nix-node-eval/src/Main.cpp rename to nixd/tools/nix-node-eval.cpp index 189a3906e..a8d538dc6 100644 --- a/nixd/nix-node-eval/src/Main.cpp +++ b/nixd/tools/nix-node-eval.cpp @@ -1,5 +1,5 @@ -#include "EvalProvider.h" +#include "nixd/Eval/EvalProvider.h" #include diff --git a/nixd/tools/nixd/src/Main.cpp b/nixd/tools/nixd.cpp similarity index 98% rename from nixd/tools/nixd/src/Main.cpp rename to nixd/tools/nixd.cpp index 9250fabad..95bce6523 100644 --- a/nixd/tools/nixd/src/Main.cpp +++ b/nixd/tools/nixd.cpp @@ -3,7 +3,7 @@ #include "lspserver/Connection.h" #include "lspserver/Logger.h" -#include "Controller.h" +#include "nixd/Controller/Controller.h" #include #include diff --git a/nixd/tools/nixd/meson.build b/nixd/tools/nixd/meson.build deleted file mode 100644 index 3a3c8a674..000000000 --- a/nixd/tools/nixd/meson.build +++ /dev/null @@ -1,31 +0,0 @@ -nixd_next = executable('nixd', - 'src/CodeAction.cpp', - 'src/Convert.cpp', - 'src/Diagnostics.cpp', - 'src/EvalClient.cpp', - 'src/Hover.cpp', - 'src/LifeTime.cpp', - 'src/Main.cpp', - 'src/Support.cpp', - 'src/TextDocumentSync.cpp', - install: true, - dependencies: [ nixd_lsp_server, nixf, llvm, libnixdrpc, libnixdutil ] -) - - -regression_env = environment() - -regression_env.append('PATH', meson.current_build_dir()) -regression_env.set('MESON_BUILD_ROOT', meson.current_build_dir()) - -if lit.found() - test( - 'regression/nixd', - lit, - env: regression_env, - args: [ - '-vv', - meson.current_source_dir() + '/test' - ], - depends: [ nixd_next ] ) -endif