清理无用文件,修复lookahead bug

Author: CppCXY

CodeFormat/src/CodeFormat.cpp

@@ -3,10 +3,8 @@
 #include <fstream>
 
 #include "LuaFormat.h"
-#include "CodeService/Config/LuaEditorConfig.h"
 #include "Util/format.h"
 #include "Util/CommandLine.h"
-#include "LuaWorkspaceFormat.h"
 #include "Util/StringUtil.h"
 
 // https://stackoverflow.com/questions/1598985/c-read-binary-stdin
@@ -70,6 +68,7 @@ int main(int argc, char **argv) {
                               "Use file wildcards to specify how to ignore files\n"
                               "\t\tseparated by ';'"
             )
+            .Add<bool>("name-style", "ns", "Enable name-style check")
             .EnableKeyValueArgs();
 
 
@@ -132,6 +131,10 @@ int main(int argc, char **argv) {
         format.SetDefaultStyle(cmd.GetKeyValueOptions());
     }
 
+    if(cmd.Get<bool>("name-style")){
+        format.SupportNameStyleCheck();
+    }
+
     if (cmd.GetTarget() == "format") {
         if (!format.Reformat()) {
             std::cerr << util::format("Exist lua syntax error") << std::endl;

CodeFormat/src/LuaFormat.cpp

@@ -15,6 +15,7 @@
 #include "Util/FileFinder.h"
 
 LuaFormat::LuaFormat() {
+    _diagnosticStyle.name_style_check = false;
 }
 
 void LuaFormat::SetWorkspace(std::string_view workspace) {
@@ -156,7 +157,15 @@ bool LuaFormat::ReformatSingleFile(std::string_view inputPath, std::string_view
 
 bool LuaFormat::Check() {
     if (_mode == WorkMode::File) {
-        return CheckSingleFile(_inputPath, std::move(_inputFileText));
+        if (_inputPath != "stdin") {
+            std::cerr << util::format("Check {} ...", _inputPath) << std::endl;
+        }
+
+        if (CheckSingleFile(_inputPath, std::move(_inputFileText))) {
+            std::cerr << util::format("Check {} ... ok", _inputPath) << std::endl;
+            return true;
+        }
+        return false;
     }
     return CheckWorkspace();
 }
@@ -167,7 +176,7 @@ void LuaFormat::DiagnosticInspection(std::string_view message, TextRange range,
     auto startChar = file->GetColumn(range.StartOffset);
     auto endLine = file->GetLine(range.EndOffset);
     auto endChar = file->GetColumn(range.EndOffset);
-    std::cout << util::format("\t{}({}:{} to {}:{}): {}", path, startLine + 1, startChar, endLine + 1, endChar,
+    std::cerr << util::format("\t{}({}:{} to {}:{}): {}", path, startLine + 1, startChar, endLine + 1, endChar,
                               message) << std::endl;
 }
 
@@ -269,14 +278,17 @@ bool LuaFormat::CheckWorkspace() {
     auto files = finder.FindFiles();
     for (auto &filePath: files) {
         auto opText = ReadFile(filePath);
+        std::string displayPath = filePath;
+        if (!_workspace.empty())
+        {
+            displayPath = string_util::GetFileRelativePath(_workspace, filePath);
+        }
         if (opText.has_value()) {
-            if (CheckSingleFile(filePath, std::move(opText.value()))) {
-                std::cerr << util::format("Check {} ok.", filePath) << std::endl;
-            } else {
-                std::cerr << util::format("Check {} fail.", filePath) << std::endl;
+            if (CheckSingleFile(displayPath, std::move(opText.value()))) {
+                std::cerr << util::format("Check {} ok.", displayPath) << std::endl;
             }
         } else {
-            std::cerr << util::format("Can not read file {}", filePath) << std::endl;
+            std::cerr << util::format("Can not read file {}", displayPath) << std::endl;
         }
     }
     return true;
@@ -317,17 +329,26 @@ bool LuaFormat::ReformatWorkspace() {
     auto files = finder.FindFiles();
     for (auto &filePath: files) {
         auto opText = ReadFile(filePath);
+        std::string displayPath = filePath;
+        if (!_workspace.empty())
+        {
+            displayPath = string_util::GetFileRelativePath(_workspace, filePath);
+        }
         if (opText.has_value()) {
-            if (ReformatSingleFile(filePath, filePath, std::move(opText.value()))) {
-                std::cerr << util::format("Reformat {} succeed.", filePath) << std::endl;
+            if (ReformatSingleFile(displayPath, filePath, std::move(opText.value()))) {
+                std::cerr << util::format("Reformat {} succeed.", displayPath) << std::endl;
             } else {
-                std::cerr << util::format("Reformat {} fail.", filePath) << std::endl;
+                std::cerr << util::format("Reformat {} fail.", displayPath) << std::endl;
             }
         } else {
-            std::cerr << util::format("Can not read file {}", filePath) << std::endl;
+            std::cerr << util::format("Can not read file {}", displayPath) << std::endl;
         }
     }
     return true;
 }
 
+void LuaFormat::SupportNameStyleCheck() {
+    _diagnosticStyle.name_style_check = true;
+}
+
 

CodeFormat/src/LuaFormat.h

@@ -38,6 +38,7 @@ class LuaFormat {
 
     void AddIgnores(std::string_view pattern);
 
+    void SupportNameStyleCheck();
 private:
     std::optional<std::string> ReadFile(std::string_view path);
 

CodeFormat/src/LuaWorkspaceFormat.cpp

@@ -75,6 +75,7 @@ LuaTokenKind LuaParser::LookAhead() {
             case TK_LONG_COMMENT:
             case TK_SHEBANG: {
                 nextIndex++;
+                break;
             }
             default: {
                 return tk;

CodeFormat/src/LuaWorkspaceFormat.h

@@ -6,11 +6,7 @@
 
 int main() {
     std::string buffer = R"(
-local t = {
-    { a, b, c = 123 },
-    { d, e, f },
-    { ddd, weff }
-}
+local t = {a--[[]]=123}
 )";
 
     auto file = std::make_shared<LuaFile>(std::move(buffer));