修复单词拼写检查对字符串的处理

Author: CppCXY

CodeService/src/Diagnostic/Spell/CodeSpellChecker.cpp

@@ -152,9 +152,7 @@ void CodeSpellChecker::IdentifyAnalyze(DiagnosticBuilder &d, LuaSyntaxNode &toke
 }
 
 void CodeSpellChecker::TextAnalyze(DiagnosticBuilder &d, LuaSyntaxNode &token, const LuaSyntaxTree &t) {
-    std::shared_ptr<spell::TextParser> parser = std::make_shared<spell::TextParser>(token.GetText(t));
-    parser->Parse();
-    auto &identifiers = parser->GetIdentifiers();
+    auto identifiers = spell::TextParser::ParseToWords(token.GetText(t));
     if (identifiers.empty()) {
         return;
     }
@@ -182,16 +180,16 @@ void CodeSpellChecker::TextAnalyze(DiagnosticBuilder &d, LuaSyntaxNode &token, c
             continue;
         }
 
+        auto tokenRange = token.GetTextRange(t);
         for (auto &word: words) {
             if (!word.Item.empty() && !_symSpell->IsCorrectWord(word.Item) && customDict.count(word.Item) == 0) {
-                auto tokenRange = token.GetTextRange(t);
                 auto range = TextRange(tokenRange.StartOffset + identifier.Range.Start + word.Range.Start,
-                                       word.Range.Count - 1
+                                       word.Range.Count
                 );
                 std::string originText(
                         token.GetText(t).substr(identifier.Range.Start + word.Range.Start, word.Range.Count));
                 d.PushDiagnostic(DiagnosticType::Spell, range,
-                                 util::format("Typo in identifier '{}'", originText), originText);
+                                 util::format("Typo in string '{}'", originText), originText);
             }
         }
     }

CodeService/src/Diagnostic/Spell/TextParser.cpp

@@ -1,25 +1,19 @@
 #include "CodeService/Diagnostic/Spell/TextParser.h"
-#include "CodeService/Diagnostic/Spell/IdentifyParser.h"
-
 using namespace spell;
 
 bool IsIdentifier(char ch) {
     return ch > 0 && (std::isalnum(ch) || ch == '_');
 }
 
-TextParser::TextParser(std::string_view source)
-        : _source(source) {
-}
-
-void TextParser::Parse() {
+std::vector<Word> TextParser::ParseToWords(std::string_view source) {
     enum class ParseState {
         Unknown,
         Identify
     } state = ParseState::Unknown;
-
+    std::vector<Word> words;
     std::size_t start = 0;
-    for (std::size_t i = 0; i != _source.size(); i++) {
-        char ch = _source[i];
+    for (std::size_t i = 0; i != source.size(); i++) {
+        char ch = source[i];
         switch (state) {
             case ParseState::Unknown: {
                 if (IsIdentifier(ch)) {
@@ -31,26 +25,23 @@ void TextParser::Parse() {
             case ParseState::Identify: {
                 if (!IsIdentifier(ch)) {
                     state = ParseState::Unknown;
-                    PushIdentifier(WordRange(start, i - start));
+                    auto len = i - start;
+                    if (len <= 3) {
+                        break;
+                    }
+                    auto range = WordRange(start, len);
+                    words.emplace_back(range, source.substr(start, len));
                 }
                 break;
             }
         }
     }
     if (state == ParseState::Identify) {
-        PushIdentifier(WordRange(start, _source.size() - start));
-    }
-}
-
-std::vector<Word> &TextParser::GetIdentifiers() {
-    return _identifiers;
-}
-
-void TextParser::PushIdentifier(spell::WordRange range) {
-    if (range.Count <= 3) {
-        return;
+        auto len = source.size() - start;
+        if (len > 3) {
+            auto range = WordRange(start, len);
+            words.emplace_back(range, source.substr(start, len));
+        }
     }
-
-    std::string_view identifyView = _source.substr(range.Start, range.Count);
-    _identifiers.emplace_back(range, std::string(identifyView));
+    return words;
 }

include/CodeService/Diagnostic/Spell/BasicSpellParserType.h

@@ -2,6 +2,7 @@
 
 #include <cinttypes>
 #include <string>
+#include <string_view>
 
 namespace spell {
 struct WordRange {
@@ -18,7 +19,7 @@ struct Word {
     WordRange Range;
     std::string Item;
 
-    Word(const WordRange &range, const std::string &item)
+    Word(const WordRange &range, std::string_view item)
             : Range(range),
               Item(item) {
     }

include/CodeService/Diagnostic/Spell/TextParser.h

@@ -8,16 +8,6 @@ namespace spell {
 // TODO Write later
 class TextParser {
 public:
-    TextParser(std::string_view source);
-
-    void Parse();
-
-    std::vector<Word> &GetIdentifiers();
-
-private:
-    void PushIdentifier(spell::WordRange range);
-
-    std::string_view _source;
-    std::vector<Word> _identifiers;
+    static std::vector<Word> ParseToWords(std::string_view source);
 };
 }