Skip to content

Commit 3c00e0c

Browse files
CppCXYCppCXY
committed
发布单词拼写检查
1 parent 28f5aec commit 3c00e0c

File tree

18 files changed

+352
-126
lines changed

18 files changed

+352
-126
lines changed

‎CodeFormatServer/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ target_sources(CodeFormatServer
5858
${CodeFormatServer_SOURCE_DIR}/src/Service/CodeFormatService.cpp
5959
${CodeFormatServer_SOURCE_DIR}/src/Service/CompletionService.cpp
6060
${CodeFormatServer_SOURCE_DIR}/src/Service/CommandService.cpp
61+
${CodeFormatServer_SOURCE_DIR}/src/Service/CodeActionService.cpp
6162

6263
# mimalloc
6364
${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/src/static.c

‎CodeFormatServer/src/LanguageClient.cpp‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "Util/Url.h"
88
#include "Util/FileFinder.h"
99
#include "asio.hpp"
10+
#include "CodeFormatServer/Service/CodeActionService.h"
1011
#include "CodeFormatServer/Service/ModuleService.h"
1112
#include "CodeFormatServer/Service/CodeFormatService.h"
1213
#include "CodeFormatServer/Service/CompletionService.h"
@@ -31,6 +32,7 @@ void LanguageClient::InitializeService()
3132
AddService<ModuleService>();
3233
AddService<CompletionService>();
3334
AddService<CommandService>();
35+
AddService<CodeActionService>();
3436

3537
for (auto service : _services)
3638
{
@@ -154,12 +156,12 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
154156
return;
155157
}
156158

157-
if (_vscodeSettings.lintCodeStyle) {
158-
auto formatDiagnostic = GetService<CodeFormatService>()->Diagnose(filename, parser, options);
159-
std::copy(formatDiagnostic.begin(), formatDiagnostic.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
160-
}
159+
// TODO move spell check to SpellService
160+
auto formatDiagnostic = GetService<CodeFormatService>()->Diagnose(filename, parser, options);
161+
std::copy(formatDiagnostic.begin(), formatDiagnostic.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
161162

162-
if (_vscodeSettings.lintModule) {
163+
if (_vscodeSettings.lintModule)
164+
{
163165
auto moduleDiagnosis = GetService<ModuleService>()->Diagnose(filename, parser);
164166
std::copy(moduleDiagnosis.begin(), moduleDiagnosis.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
165167
}
@@ -177,8 +179,9 @@ void LanguageClient::DelayDiagnosticFile(std::string_view uri)
177179
it->second->cancel();
178180
it->second = task;
179181
}
180-
else {
181-
_fileDiagnosticTask.insert({ stringUri, task });
182+
else
183+
{
184+
_fileDiagnosticTask.insert({stringUri, task});
182185
}
183186

184187
task->async_wait([this, stringUri](const asio::error_code& code)
@@ -316,14 +319,16 @@ asio::io_context& LanguageClient::GetIOContext()
316319
return _ioc;
317320
}
318321

319-
vscode::VscodeSettings LanguageClient::GetSettings() const
322+
vscode::VscodeSettings& LanguageClient::GetSettings()
320323
{
321324
return _vscodeSettings;
322325
}
323326

324327
void LanguageClient::SetVscodeSettings(vscode::VscodeSettings& settings)
325328
{
326329
_vscodeSettings = settings;
330+
331+
GetService<CodeFormatService>()->SetCustomDictionary(_vscodeSettings.spellDict);
327332
}
328333

329334
uint64_t LanguageClient::GetRequestId()

‎CodeFormatServer/src/LanguageService.cpp‎

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "CodeService/LuaCodeStyleOptions.h"
99
#include "CodeService/LuaFormatter.h"
1010
#include "CodeFormatServer/LanguageClient.h"
11+
#include "CodeFormatServer/Service/CodeActionService.h"
1112
#include "CodeFormatServer/Service/CodeFormatService.h"
1213
#include "CodeFormatServer/Service/CommandService.h"
1314
#include "CodeFormatServer/Service/ModuleService.h"
@@ -42,6 +43,7 @@ bool LanguageService::Initialize()
4243
JsonProtocol("workspace/executeCommand", &LanguageService::OnExecuteCommand);
4344
JsonProtocol("workspace/didChangeWatchedFiles", &LanguageService::OnDidChangeWatchedFiles);
4445
JsonProtocol("textDocument/completion", &LanguageService::OnCompletion);
46+
JsonProtocol("workspace/didChangeConfiguration", &LanguageService::OnWorkspaceDidChangeConfiguration);
4547
return true;
4648
}
4749

@@ -140,7 +142,10 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
140142
auto dictionaryPath = param->initializationOptions.dictionaryPath;
141143
if (!dictionaryPath.empty())
142144
{
143-
LanguageClient::GetInstance().GetService<CodeFormatService>()->LoadDictionary(dictionaryPath);
145+
for (auto& path : dictionaryPath)
146+
{
147+
LanguageClient::GetInstance().GetService<CodeFormatService>()->LoadDictionary(path);
148+
}
144149
}
145150
return result;
146151
}
@@ -344,58 +349,11 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
344349

345350
std::shared_ptr<vscode::CodeActionResult> LanguageService::OnCodeAction(std::shared_ptr<vscode::CodeActionParams> param)
346351
{
347-
// TODO refactor move to CodeActionService
348-
auto range = param->range;
349-
auto uri = param->textDocument.uri;
350-
auto filePath = url::UrlToFilePath(uri);
351352
auto codeActionResult = std::make_shared<vscode::CodeActionResult>();
352353

353354
for (auto& diagnostic : param->context.diagnostics)
354355
{
355-
if (LanguageClient::GetInstance().GetService<CodeFormatService>()->IsCodeFormatDiagnostic(diagnostic))
356-
{
357-
auto& action = codeActionResult->actions.emplace_back();
358-
std::string title = "reformat current line";
359-
action.title = title;
360-
action.command.title = title;
361-
action.command.command = LanguageClient::GetInstance().
362-
GetService<CommandService>()->GetCommand(CommandService::Command::Reformat);
363-
action.command.arguments.push_back(param->textDocument.uri);
364-
action.command.arguments.push_back(param->range.Serialize());
365-
366-
action.kind = vscode::CodeActionKind::QuickFix;
367-
}
368-
else if (LanguageClient::GetInstance().GetService<CodeFormatService>()->IsSpellDiagnostic(diagnostic))
369-
{
370-
LanguageClient::GetInstance().GetService<CodeFormatService>()->MakeSpellActions(
371-
codeActionResult, diagnostic, param->textDocument.uri);
372-
}
373-
else if (LanguageClient::GetInstance().GetService<ModuleService>()->IsModuleDiagnostic(diagnostic))
374-
{
375-
auto modules = LanguageClient::GetInstance().GetService<ModuleService>()->GetImportModules(filePath, range);
376-
auto& action = codeActionResult->actions.emplace_back();
377-
std::string title = "import multi choice";
378-
if (modules.size() == 1)
379-
{
380-
title = Util::format("import '{}'", modules.front().ModuleName);
381-
}
382-
action.title = title;
383-
action.command.title = title;
384-
action.command.command = LanguageClient::GetInstance().
385-
GetService<CommandService>()->GetCommand(CommandService::Command::Import);
386-
action.command.arguments.push_back(param->textDocument.uri);
387-
action.command.arguments.push_back(param->range.Serialize());
388-
for (auto& module : modules)
389-
{
390-
auto object = nlohmann::json::object();
391-
object["moduleName"] = module.ModuleName;
392-
object["path"] = module.FilePath;
393-
object["name"] = module.Name;
394-
action.command.arguments.push_back(object);
395-
}
396-
397-
action.kind = vscode::CodeActionKind::QuickFix;
398-
}
356+
LanguageClient::GetInstance().GetService<CodeActionService>()->Dispatch(diagnostic, param, codeActionResult);
399357
}
400358
return codeActionResult;
401359
}
@@ -441,10 +399,10 @@ std::shared_ptr<vscode::CompletionList> LanguageService::OnCompletion(std::share
441399
{
442400
auto list = std::make_shared<vscode::CompletionList>();
443401

444-
if (!LanguageClient::GetInstance().GetSettings().autoImport)
445-
{
446-
return list;
447-
}
402+
// if (!LanguageClient::GetInstance().GetSettings().autoImport)
403+
// {
404+
// return list;
405+
// }
448406

449407
auto uri = param->textDocument.uri;
450408

@@ -458,3 +416,52 @@ std::shared_ptr<vscode::CompletionList> LanguageService::OnCompletion(std::share
458416

459417
return list;
460418
}
419+
420+
std::shared_ptr<vscode::Serializable> LanguageService::OnWorkspaceDidChangeConfiguration(
421+
std::shared_ptr<vscode::DidChangeConfigurationParams> param)
422+
{
423+
vscode::VscodeSettings& setting = LanguageClient::GetInstance().GetSettings();
424+
// TODO more modern method
425+
if (param->settings["emmylua"].is_object())
426+
{
427+
auto emmylua = param->settings["emmylua"];
428+
if (emmylua["lint"].is_object())
429+
{
430+
auto lint = emmylua["lint"];
431+
if (lint["moduleCheck"].is_boolean())
432+
{
433+
setting.lintModule = lint["moduleCheck"];
434+
}
435+
if (lint["codeStyle"].is_boolean())
436+
{
437+
setting.lintCodeStyle = lint["codeStyle"];
438+
}
439+
}
440+
441+
if (emmylua["spell"].is_object())
442+
{
443+
auto spell = emmylua["spell"];
444+
if (spell["enable"].is_boolean())
445+
{
446+
setting.spellEnable = spell["enable"];
447+
}
448+
449+
if (spell["dict"].is_array())
450+
{
451+
setting.spellDict.clear();
452+
for (auto j : spell["dict"])
453+
{
454+
if (j.is_string())
455+
{
456+
setting.spellDict.push_back(j);
457+
}
458+
}
459+
}
460+
}
461+
}
462+
463+
464+
LanguageClient::GetInstance().SetVscodeSettings(setting);
465+
466+
return nullptr;
467+
}

‎CodeFormatServer/src/Service/CodeActionService.cpp‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
#include "CodeFormatServer/Service/CodeActionService.h"
2+
3+
#include "CodeFormatServer/Service/CodeFormatService.h"
4+
#include "CodeFormatServer/Service/CommandService.h"
5+
#include "CodeFormatServer/Service/ModuleService.h"
6+
#include "Util/Url.h"
7+
#include "Util/format.h"
8+
9+
CodeActionService::CodeActionService(std::shared_ptr<LanguageClient> owner)
10+
: Service(owner)
11+
{
12+
}
13+
14+
bool CodeActionService::Initialize()
15+
{
16+
CodeProtocol(DiagnosticCode::Spell, &CodeActionService::Spell);
17+
CodeProtocol(DiagnosticCode::Reformat, &CodeActionService::Reformat);
18+
CodeProtocol(DiagnosticCode::Module, &CodeActionService::Module);
19+
20+
return true;
21+
}
22+
23+
void CodeActionService::Dispatch(vscode::Diagnostic& diagnostic, std::shared_ptr<vscode::CodeActionParams> param,
24+
std::shared_ptr<vscode::CodeActionResult> results)
25+
{
26+
if (diagnostic.code.empty())
27+
{
28+
return;
29+
}
30+
31+
auto it = _handles.find(diagnostic.code);
32+
if (it != _handles.end())
33+
{
34+
it->second(diagnostic, param, results);
35+
}
36+
}
37+
38+
39+
std::string CodeActionService::GetCode(DiagnosticCode code)
40+
{
41+
switch (code)
42+
{
43+
case DiagnosticCode::Spell: return "EmmyLua (spell-check)";
44+
case DiagnosticCode::Module: return "EmmyLua (module-check)";
45+
case DiagnosticCode::Reformat: return "EmmyLua (style-check)";
46+
}
47+
48+
return "";
49+
}
50+
51+
void CodeActionService::CodeProtocol(DiagnosticCode code, CodeActionHandleMember handle)
52+
{
53+
auto command = GetCode(code);
54+
_handles[command] = [this, handle](auto diagnostic, auto params, auto result)
55+
{
56+
return (this->*handle)(diagnostic, params, result);
57+
};
58+
}
59+
60+
void CodeActionService::Reformat(vscode::Diagnostic& diagnostic, std::shared_ptr<vscode::CodeActionParams> param,
61+
std::shared_ptr<vscode::CodeActionResult> result)
62+
{
63+
auto& action = result->actions.emplace_back();
64+
std::string title = "reformat current line";
65+
action.title = title;
66+
action.command.title = title;
67+
action.command.command = GetService<CommandService>()->GetCommand(CommandService::Command::Reformat);
68+
action.command.arguments.push_back(param->textDocument.uri);
69+
action.command.arguments.push_back(param->range.Serialize());
70+
71+
action.kind = vscode::CodeActionKind::QuickFix;
72+
}
73+
74+
void CodeActionService::Spell(vscode::Diagnostic& diagnostic, std::shared_ptr<vscode::CodeActionParams> param,
75+
std::shared_ptr<vscode::CodeActionResult> result)
76+
{
77+
auto& originText = diagnostic.data;
78+
if (originText.empty())
79+
{
80+
return;
81+
}
82+
83+
// add to custom dictionary
84+
{
85+
auto& action = result->actions.emplace_back();
86+
87+
action.title = Util::format("Add '{}' to user dictionary", originText);
88+
action.command.title = action.title;
89+
action.command.command = GetService<CommandService>()->GetCommand(CommandService::Command::SpellAddDict);
90+
action.command.arguments.push_back(originText);
91+
92+
action.kind = vscode::CodeActionKind::QuickFix;
93+
}
94+
95+
auto spellChecker = GetService<CodeFormatService>()->GetSpellChecker();
96+
auto suggests = spellChecker->GetSuggests(originText);
97+
for (auto& suggest : suggests)
98+
{
99+
if (!suggest.Term.empty())
100+
{
101+
auto& action = result->actions.emplace_back();
102+
auto& term = suggest.Term;
103+
104+
action.title = term;
105+
action.command.title = term;
106+
action.command.command = GetService<CommandService>()->GetCommand(CommandService::Command::SpellCorrect);
107+
action.command.arguments.push_back(param->textDocument.uri);
108+
action.command.arguments.push_back(diagnostic.range.Serialize());
109+
action.command.arguments.push_back(term);
110+
111+
action.kind = vscode::CodeActionKind::QuickFix;
112+
}
113+
}
114+
}
115+
116+
void CodeActionService::Module(vscode::Diagnostic& diagnostic, std::shared_ptr<vscode::CodeActionParams> param,
117+
std::shared_ptr<vscode::CodeActionResult> result)
118+
{
119+
auto range = param->range;
120+
auto uri = param->textDocument.uri;
121+
auto filePath = url::UrlToFilePath(uri);
122+
auto modules = GetService<ModuleService>()->GetImportModules(filePath, range);
123+
auto& action = result->actions.emplace_back();
124+
std::string title = "import multi choice";
125+
if (modules.size() == 1)
126+
{
127+
title = Util::format("import '{}'", modules.front().ModuleName);
128+
}
129+
action.title = title;
130+
action.command.title = title;
131+
action.command.command = GetService<CommandService>()->GetCommand(CommandService::Command::Import);
132+
action.command.arguments.push_back(uri);
133+
action.command.arguments.push_back(range.Serialize());
134+
for (auto& module : modules)
135+
{
136+
auto object = nlohmann::json::object();
137+
object["moduleName"] = module.ModuleName;
138+
object["path"] = module.FilePath;
139+
object["name"] = module.Name;
140+
action.command.arguments.push_back(object);
141+
}
142+
143+
action.kind = vscode::CodeActionKind::QuickFix;
144+
}

0 commit comments

Comments
 (0)