支持临时字典

Author: CppCXY

CodeFormatLib/src/CodeFormatLib.cpp

@@ -441,7 +441,21 @@ int spell_analysis(lua_State* L)
 		{
 			std::string filename = lua_tostring(L, 1);
 			std::string text = lua_tostring(L, 2);
-			auto diagnosticInfos = LuaCodeFormat::GetInstance().SpellCheck(filename, std::move(text));
+
+			std::set<std::string> tempDict;
+
+			if (top == 3 && lua_istable(L, 3))
+			{
+				lua_pushnil(L);
+				while (lua_next(L, -2) != 0)
+				{
+					auto value = luaToString(L, -1);
+					tempDict.insert(value);
+					lua_pop(L, 1);
+				}
+			}
+
+			auto diagnosticInfos = LuaCodeFormat::GetInstance().SpellCheck(filename, std::move(text), tempDict);
 
 			lua_pushboolean(L, true);
 			int count = 1;

CodeFormatLib/src/LuaCodeFormat.cpp

@@ -133,7 +133,7 @@ std::pair<bool, std::vector<LuaDiagnosisInfo>> LuaCodeFormat::Diagnose(const std
 	return std::make_pair(true, ctx.GetDiagnosisInfos());
 }
 
-std::vector<LuaDiagnosisInfo> LuaCodeFormat::SpellCheck(const std::string& uri, std::string&& text)
+std::vector<LuaDiagnosisInfo> LuaCodeFormat::SpellCheck(const std::string& uri, std::string&& text, std::set<std::string>& tempDict)
 {
 	auto parser = LuaParser::LoadFromBuffer(std::move(text));
 

CodeFormatLib/src/LuaCodeFormat.h

@@ -32,7 +32,7 @@ class LuaCodeFormat
 
 	std::pair<bool, std::vector<LuaDiagnosisInfo>> Diagnose(const std::string& uri, std::string&& text);
 
-	std::vector<LuaDiagnosisInfo> SpellCheck(const std::string& uri, std::string&& text);
+	std::vector<LuaDiagnosisInfo> SpellCheck(const std::string& uri, std::string&& text, std::set<std::string>& tempDict);
 
 	std::vector<SuggestItem> SpellCorrect(const std::string& word);
 

CodeService/src/Spell/CodeSpellChecker.cpp

@@ -22,7 +22,7 @@ void CodeSpellChecker::LoadDictionaryFromBuffer(std::string_view buffer)
 	_symSpell->LoadWordDictionaryFromBuffer(buffer);
 }
 
-void CodeSpellChecker::Analysis(DiagnosisContext& ctx)
+void CodeSpellChecker::Analysis(DiagnosisContext& ctx, const std::set<std::string>& tempDict)
 {
 	auto parser = ctx.GetParser();
 	auto tokenParser = parser->GetTokenParser();
@@ -31,7 +31,7 @@ void CodeSpellChecker::Analysis(DiagnosisContext& ctx)
 	{
 		if (token.TokenType == TK_NAME)
 		{
-			IdentifyAnalysis(ctx, token);
+			IdentifyAnalysis(ctx, token, tempDict);
 		}
 	}
 }
@@ -150,7 +150,7 @@ std::vector<SuggestItem> CodeSpellChecker::GetSuggests(std::string word)
 	return suggests;
 }
 
-void CodeSpellChecker::IdentifyAnalysis(DiagnosisContext& ctx, LuaToken& token)
+void CodeSpellChecker::IdentifyAnalysis(DiagnosisContext& ctx, LuaToken& token, const std::set<std::string>& tempDict)
 {
 	std::shared_ptr<IdentifyParser> parser = nullptr;
 	std::string text(token.Text);
@@ -174,7 +174,7 @@ void CodeSpellChecker::IdentifyAnalysis(DiagnosisContext& ctx, LuaToken& token)
 
 	for (auto& word : words)
 	{
-		if (!word.Item.empty() && !_symSpell->IsCorrectWord(word.Item))
+		if (!word.Item.empty() && !_symSpell->IsCorrectWord(word.Item) && tempDict.count(word.Item) == 0)
 		{
 			auto range = TextRange(token.Range.StartOffset + word.Range.Start,
 			                       token.Range.StartOffset + word.Range.Start + word.Range.Count - 1

include/CodeService/Spell/CodeSpellChecker.h

@@ -16,12 +16,12 @@ class CodeSpellChecker
 
 	void LoadDictionaryFromBuffer(std::string_view buffer);
 
-	void Analysis(DiagnosisContext& ctx);
+	void Analysis(DiagnosisContext& ctx, const std::set<std::string>& tempDict = std::set<std::string>());
 
 	// copy once
 	std::vector<SuggestItem> GetSuggests(std::string word);
 private:
-	void IdentifyAnalysis(DiagnosisContext& ctx, LuaToken& token);
+	void IdentifyAnalysis(DiagnosisContext& ctx, LuaToken& token, const std::set<std::string>& tempDict);
 
 	std::shared_ptr<SymSpell> _symSpell;
 	std::unordered_map<std::string, std::shared_ptr<IdentifyParser>> _caches;