Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

Author: CppCXY

CodeFormat/src/LuaFormat.cpp

@@ -13,6 +13,7 @@
 #include "LuaParser/Parse/LuaParser.h"
 #include "CodeService/Diagnostic/DiagnosticBuilder.h"
 #include "Util/FileFinder.h"
+#include "Util/Url.h"
 
 LuaFormat::LuaFormat() {
     _diagnosticStyle.name_style_check = false;

CodeFormatServer/src/Service/ConfigService.cpp

@@ -4,6 +4,7 @@
 #include "CodeService/Config/LanguageTranslator.h"
 #include "LanguageServer.h"
 #include "DiagnosticService.h"
+#include "Util/Url.h"
 
 ConfigService::ConfigService(LanguageServer *owner)
         : Service(owner) {
@@ -23,7 +24,8 @@ LuaStyle &ConfigService::GetLuaStyle(std::string_view fileUri) {
     }
 
     if (editorConfig) {
-        return editorConfig->Generate(fileUri);
+        auto filePath = url::UrlToFilePath(fileUri);
+        return editorConfig->Generate(filePath);
     }
     return _defaultStyle;
 }

CodeService/src/Config/LuaEditorConfig.cpp

@@ -6,7 +6,6 @@
 #include <regex>
 
 #include "Util/StringUtil.h"
-#include "Util/Url.h"
 
 std::shared_ptr<LuaEditorConfig> LuaEditorConfig::LoadFromFile(const std::string &path) {
     std::fstream fin(path, std::ios::in);
@@ -56,8 +55,7 @@ void LuaEditorConfig::Parse() {
     }
 }
 
-LuaStyle &LuaEditorConfig::Generate(std::string_view fileUri) {
-    auto filePath = url::UrlToFilePath(fileUri);
+LuaStyle &LuaEditorConfig::Generate(std::string_view filePath) {
 
     std::vector<std::size_t> patternSection;
     for (std::size_t i = 0; i != _sections.size(); i++) {

CodeService/src/Format/Analyzer/SpaceAnalyzer.cpp

@@ -314,23 +314,23 @@ void SpaceAnalyzer::SpaceRight(LuaSyntaxNode &n, const LuaSyntaxTree &t, std::si
     _rightSpaces[token.GetIndex()] = space;
 }
 
-std::optional<std::size_t> SpaceAnalyzer::GetRightSpace(LuaSyntaxNode &n) const {
+SpaceAnalyzer::OptionalInt SpaceAnalyzer::GetRightSpace(LuaSyntaxNode &n) const {
     if (_ignoreSpace.count(n.GetIndex())) {
-        return {};
+        return OptionalInt();
     }
 
     auto it = _rightSpaces.find(n.GetIndex());
     if (it == _rightSpaces.end()) {
-        return {};
+        return OptionalInt();
     }
-    return it->second;
+    return OptionalInt(it->second);
 }
 
 std::size_t
 SpaceAnalyzer::ProcessSpace(const LuaSyntaxTree &t, LuaSyntaxNode &left, LuaSyntaxNode &right) {
     auto rightSpaceOfLeftToken = GetRightSpace(left);
-    if (rightSpaceOfLeftToken.has_value()) {
-        return rightSpaceOfLeftToken.value();
+    if (rightSpaceOfLeftToken.HasValue) {
+        return rightSpaceOfLeftToken.Value;
     }
     if (!right.IsNull(t)) {
         return t.GetStartOffset(right.GetIndex()) - t.GetEndOffset(left.GetIndex()) - 1;

CodeService/src/RangeFormat/RangeFormatBuilder.cpp

@@ -2,7 +2,7 @@
 #include "LuaParser/Lexer/LuaTokenTypeDetail.h"
 
 RangeFormatBuilder::RangeFormatBuilder(LuaStyle &style, FormatRange &range)
-        : FormatBuilder(style), _range(range), _validRange(false) {
+        : FormatBuilder(style), _validRange(false), _range(range) {
 
 }
 

LuaParser/src/Ast/LuaSyntaxTree.cpp

@@ -64,11 +64,12 @@ void LuaSyntaxTree::BuildTree(LuaParser &p) {
 
     FinishNode(p);
 
-    _syntaxNodes.reserve(_nodeOrTokens.size() - 1);
-    for (auto i = 0; i != _nodeOrTokens.size() - 1; i++) {
-        _syntaxNodes.emplace_back(i + 1);
+    if (!_nodeOrTokens.empty()) {
+        _syntaxNodes.reserve(_nodeOrTokens.size() - 1);
+        for (std::size_t i = 0; i != _nodeOrTokens.size() - 1; i++) {
+            _syntaxNodes.emplace_back(i + 1);
+        }
     }
-
 }
 
 void LuaSyntaxTree::StartNode(LuaSyntaxNodeKind kind, LuaParser &p) {
@@ -368,8 +369,8 @@ std::size_t LuaSyntaxTree::GetNextToken(std::size_t index) const {
         }
     }
 
-    if(tokenNodeIndex != 0) {
-        auto& token = _nodeOrTokens[tokenNodeIndex];
+    if (tokenNodeIndex != 0) {
+        auto &token = _nodeOrTokens[tokenNodeIndex];
         if (token.Data.TokenIndex + 1 < _tokens.size()) {
             return _tokens[token.Data.TokenIndex + 1].NodeIndex;
         }

include/CodeService/Format/Analyzer/SpaceAnalyzer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <optional>
 #include <unordered_set>
 #include <unordered_map>
 #include "CodeService/Format/Analyzer/FormatAnalyzer.h"
@@ -9,6 +8,16 @@ class SpaceAnalyzer : public FormatAnalyzer {
 public:
     DECLARE_FORMAT_ANALYZER(SpaceAnalyzer)
 
+    // workaround for mac 10.13
+    struct OptionalInt {
+        OptionalInt() : HasValue(false), Value(0) {}
+
+        explicit OptionalInt(std::size_t value) : HasValue(true), Value(value) {}
+
+        bool HasValue;
+        std::size_t Value;
+    };
+
     SpaceAnalyzer();
 
     void Analyze(FormatState &f, const LuaSyntaxTree &t) override;
@@ -26,9 +35,7 @@ class SpaceAnalyzer : public FormatAnalyzer {
     void SpaceIgnore(LuaSyntaxNode &n, const LuaSyntaxTree &t);
 
 private:
-//    std::optional<std::size_t> GetLeftSpace(LuaSyntaxNode &n) const;
-
-    std::optional<std::size_t> GetRightSpace(LuaSyntaxNode &n) const;
+    OptionalInt GetRightSpace(LuaSyntaxNode &n) const;
 
     std::size_t ProcessSpace(const LuaSyntaxTree &t, LuaSyntaxNode &left, LuaSyntaxNode &right);