csh
/
tsl-devkit
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

♻️ refactor(lsp_server): move entrypoints out of named modules 

- export Run() from launcher module and add non-module main TU
- apply same pattern to module-based test executables
- migrate utils/string implementation fully into string.cppm and drop string.cpp
- point clangd to linux build compilation database
This commit is contained in:
csh 2025-12-13 19:55:45 +08:00
parent f7d5a74615
commit e5782c76fa
24 changed files with 188 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lsp-server/.clangd
View File

@ -1,5 +1,9 @@
CompileFlags:
CompilationDatabase: build/clang-linux/Release
---
If:
PathMatch: [.*\.hpp, .*\.cpp]
PathMatch: [.*\.hpp, .*\.hxx, .*\.cpp, .*\.cc, .*\.cxx, .*\.cppm, .*\.ixx, .*\.mpp]
CompileFlags:
Add:

6
lsp-server/src/CMakeLists.txt
View File

@ -41,9 +41,9 @@ endif()
set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
set(SOURCES
main.cppm
cli/launcher.cppm
main.cc
utils/args_parser.cppm
utils/string.cpp
utils/text_coordinates.cppm
core/dispacther.cppm
core/server.cppm
@ -86,7 +86,7 @@ target_sources(
bridge/spdlog.cppm
bridge/taskflow.cppm
bridge/tree_sitter.cppm
main.cppm
cli/launcher.cppm
language/ast/ast.cppm
language/ast/types.cppm
language/ast/deserializer.cppm

6
lsp-server/src/main.cppm → lsp-server/src/cli/launcher.cppm
View File

@ -1,14 +1,14 @@
module;
export module lsp.cli.launcher;
export module lsp.main;
import spdlog;
import std;
import lsp.core.server;
import lsp.utils.args_parser;
int main(int argc, char* argv[])
export int Run(int argc, char* argv[])
{
lsp::utils::ArgsParser& args_parser = lsp::utils::ArgsParser::Instance();
auto& config = args_parser.Parse(argc, argv);

6
lsp-server/src/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.cli.launcher;
int main(int argc, char* argv[])
{
return Run(argc, argv);
}

130
lsp-server/src/utils/string.cpp
View File

@ -1,130 +0,0 @@
module;
import std;
module lsp.utils.string;
namespace lsp::utils
{
std::string Trim(const std::string& str)
{
std::size_t first = str.find_first_not_of(" \t\n\r");
if (first == std::string::npos)
return "";
std::size_t last = str.find_last_not_of(" \t\n\r");
return str.substr(first, last - first + 1);
}
std::string ToLower(const std::string& str)
{
std::string result = str;
std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) { return std::tolower(c); });
return result;
}
std::string ToUpper(const std::string& str)
{
std::string result = str;
std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) { return std::toupper(c); });
return result;
}
bool StartsWith(const std::string& str, const std::string& prefix)
{
if (prefix.size() > str.size())
return false;
return str.compare(0, prefix.size(), prefix) == 0;
}
bool EndsWith(const std::string& str, const std::string& suffix)
{
if (suffix.size() > str.size())
return false;
return str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0;
}
// ==================== 大小写不敏感比较 ====================
bool IEquals(const std::string& a, const std::string& b)
{
if (a.size() != b.size())
return false;
return std::equal(a.begin(), a.end(), b.begin(), [](unsigned char ca, unsigned char cb) {
return std::tolower(ca) == std::tolower(cb);
});
}
bool IStartsWith(const std::string& str, const std::string& prefix)
{
if (prefix.size() > str.size())
return false;
for (std::size_t i = 0; i < prefix.size(); ++i)
{
if (std::tolower(static_cast<unsigned char>(str[i])) !=
std::tolower(static_cast<unsigned char>(prefix[i])))
return false;
}
return true;
}
bool IEndsWith(const std::string& str, const std::string& suffix)
{
if (suffix.size() > str.size())
return false;
std::size_t offset = str.size() - suffix.size();
for (std::size_t i = 0; i < suffix.size(); ++i)
{
if (std::tolower(static_cast<unsigned char>(str[offset + i])) !=
std::tolower(static_cast<unsigned char>(suffix[i])))
return false;
}
return true;
}
int ICompare(const std::string& a, const std::string& b)
{
std::size_t min_len = std::min(a.size(), b.size());
for (std::size_t i = 0; i < min_len; ++i)
{
int ca = std::tolower(static_cast<unsigned char>(a[i]));
int cb = std::tolower(static_cast<unsigned char>(b[i]));
if (ca != cb)
return ca - cb;
}
// 长度不同
if (a.size() < b.size())
return -1;
if (a.size() > b.size())
return 1;
return 0;
}
std::size_t IHash(const std::string& str)
{
std::size_t hash = 0;
for (unsigned char c : str)
hash = hash * 31 + std::tolower(c);
return hash;
}
std::size_t IHasher::operator()(const std::string& key) const
{
return IHash(key);
}
bool IEqualTo::operator()(const std::string& a, const std::string& b) const
{
return IEquals(a, b);
}
bool ILess::operator()(const std::string& a, const std::string& b) const
{
return ICompare(a, b) < 0;
}
}

123
lsp-server/src/utils/string.cppm
View File

@ -38,3 +38,126 @@ export namespace lsp::utils
bool operator()(const std::string& a, const std::string& b) const;
};
}
namespace lsp::utils
{
std::string Trim(const std::string& str)
{
std::size_t first = str.find_first_not_of(" \t\n\r");
if (first == std::string::npos)
return "";
std::size_t last = str.find_last_not_of(" \t\n\r");
return str.substr(first, last - first + 1);
}
std::string ToLower(const std::string& str)
{
std::string result = str;
std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) { return std::tolower(c); });
return result;
}
std::string ToUpper(const std::string& str)
{
std::string result = str;
std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) { return std::toupper(c); });
return result;
}
bool StartsWith(const std::string& str, const std::string& prefix)
{
if (prefix.size() > str.size())
return false;
return str.compare(0, prefix.size(), prefix) == 0;
}
bool EndsWith(const std::string& str, const std::string& suffix)
{
if (suffix.size() > str.size())
return false;
return str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0;
}
bool IEquals(const std::string& a, const std::string& b)
{
if (a.size() != b.size())
return false;
return std::equal(a.begin(), a.end(), b.begin(), [](unsigned char ca, unsigned char cb) {
return std::tolower(ca) == std::tolower(cb);
});
}
bool IStartsWith(const std::string& str, const std::string& prefix)
{
if (prefix.size() > str.size())
return false;
for (std::size_t i = 0; i < prefix.size(); ++i)
{
if (std::tolower(static_cast<unsigned char>(str[i])) !=
std::tolower(static_cast<unsigned char>(prefix[i])))
return false;
}
return true;
}
bool IEndsWith(const std::string& str, const std::string& suffix)
{
if (suffix.size() > str.size())
return false;
std::size_t offset = str.size() - suffix.size();
for (std::size_t i = 0; i < suffix.size(); ++i)
{
if (std::tolower(static_cast<unsigned char>(str[offset + i])) !=
std::tolower(static_cast<unsigned char>(suffix[i])))
return false;
}
return true;
}
int ICompare(const std::string& a, const std::string& b)
{
std::size_t min_len = std::min(a.size(), b.size());
for (std::size_t i = 0; i < min_len; ++i)
{
int ca = std::tolower(static_cast<unsigned char>(a[i]));
int cb = std::tolower(static_cast<unsigned char>(b[i]));
if (ca != cb)
return ca - cb;
}
if (a.size() < b.size())
return -1;
if (a.size() > b.size())
return 1;
return 0;
}
std::size_t IHash(const std::string& str)
{
std::size_t hash = 0;
for (unsigned char c : str)
hash = hash * 31 + std::tolower(c);
return hash;
}
std::size_t IHasher::operator()(const std::string& key) const
{
return IHash(key);
}
bool IEqualTo::operator()(const std::string& a, const std::string& b) const
{
return IEquals(a, b);
}
bool ILess::operator()(const std::string& a, const std::string& b) const
{
return ICompare(a, b) < 0;
}
}

2
lsp-server/test/test_ast/CMakeLists.txt
View File

@ -18,10 +18,10 @@ endif()
set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
set(SOURCES
main.cc
test.cppm
debug_printer.cppm
../../src/utils/string.cppm
../../src/utils/string.cpp
../../src/tree-sitter/scanner.c
../../src/tree-sitter/parser.c)

6
lsp-server/test/test_ast/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.test.ast.main;
int main(int argc, char* argv[])
{
return Run(argc, argv);
}

2
lsp-server/test/test_ast/test.cppm
View File

@ -120,7 +120,7 @@ void PrintUsage(const char* program_name)
std::cout << " " << program_name << " test.tsf -s -n # Show source without colors\n";
}
int main(int argc, char* argv[])
export int Run(int argc, char* argv[])
{
if (argc < 2)
{

1
lsp-server/test/test_lsp_any/CMakeLists.txt
View File

@ -13,6 +13,7 @@ if(UNIX AND NOT APPLE)
endif()
set(SOURCES
main.cc
test_main.cppm)
add_executable(${PROJECT_NAME} ${SOURCES})

6
lsp-server/test/test_lsp_any/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.test.lsp_any.main;
int main()
{
return Run();
}

2
lsp-server/test/test_lsp_any/test_main.cppm
View File

@ -10,7 +10,7 @@ import lsp.test.lsp_any.transformer;
import lsp.test.lsp_any.facade;
import lsp.test.lsp_any.common;
int main()
export int Run()
{
lsp::test::TestRunner runner;

2
lsp-server/test/test_module/CMakeLists.txt
View File

@ -12,7 +12,7 @@ endif()
set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
add_executable(test_module main.cppm)
add_executable(test_module main.cppm main.cc)
target_sources(
test_module
PRIVATE

6
lsp-server/test/test_module/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.test.module_demo.main;
int main()
{
return Run();
}

2
lsp-server/test/test_module/main.cppm
View File

@ -7,7 +7,7 @@ import std;
import math;
import math2;
int main()
export int Run()
{
std::cout << "hello std module\n";
std::vector<int> v{ 1, 2, 3 };

1
lsp-server/test/test_scheduler/CMakeLists.txt
View File

@ -15,6 +15,7 @@ if(UNIX AND NOT APPLE)
endif()
set(SOURCES
main.cc
test_async_executor.cppm)
add_executable(${PROJECT_NAME} ${SOURCES})

6
lsp-server/test/test_scheduler/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.test.scheduler.async_executor;
int main()
{
return Run();
}

2
lsp-server/test/test_scheduler/test_async_executor.cppm
View File

@ -55,7 +55,7 @@ namespace
};
}
int main()
export int Run()
{
SchedulerTestSuite suite;

2
lsp-server/test/test_semantic/CMakeLists.txt
View File

@ -17,9 +17,9 @@ endif()
set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
set(SOURCES
main.cc
test_semantic.cppm
../../src/utils/string.cppm
../../src/utils/string.cpp
../../src/language/symbol/internal/builder.cppm
../../src/language/symbol/internal/store.cppm
../../src/language/symbol/internal/table.cppm

6
lsp-server/test/test_semantic/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.test.semantic.main;
int main(int argc, char** argv)
{
return Run(argc, argv);
}

2
lsp-server/test/test_semantic/test_semantic.cppm
View File

@ -436,7 +436,7 @@ namespace
}
}
int main(int argc, char** argv)
export int Run(int argc, char** argv)
{
try
{

2
lsp-server/test/test_symbol/CMakeLists.txt
View File

@ -18,9 +18,9 @@ endif()
set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
set(SOURCES
main.cc
test.cppm
../../src/utils/string.cppm
../../src/utils/string.cpp
../../src/language/symbol/internal/builder.cppm
../../src/language/symbol/internal/store.cppm
../../src/language/symbol/internal/table.cppm

6
lsp-server/test/test_symbol/main.cc Normal file
View File

@ -0,0 +1,6 @@
import lsp.test.symbol.main;
int main(int argc, char* argv[])
{
return Run(argc, argv);
}

2
lsp-server/test/test_symbol/test.cppm
View File

@ -1050,7 +1050,7 @@ void AnalyzeFile(const Options& options)
// ==================== 主程序 ====================
int main(int argc, char* argv[])
export int Run(int argc, char* argv[])
{
Options options;