Skip to content

support almost nonstandard token formatting #2184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2023
Merged

support almost nonstandard token formatting #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee11979
support almost nonstandard symbol
CppCXY Jun 27, 2023
0b26b19
update formatting.lua
CppCXY Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rd/EmmyLuaCodeStyle
Open in desktop
Submodule EmmyLuaCodeStyle updated 20 files
+17 −5 .github/workflows/build.yml
+29 −0 CONTRIBUTING.md
+13 −13 CodeFormatCore/include/CodeFormatCore/Config/LuaStyle.h
+1 −1 CodeFormatCore/include/CodeFormatCore/Diagnostic/Spell/IdentifyParser.h
+1 −1 CodeFormatCore/src/Diagnostic/Spell/TextParser.cpp
+18 −0 CodeFormatLib/src/LuaCodeFormat.cpp
+2 −2 LuaParser/include/LuaParser/Ast/LuaSyntaxNode.h
+3 −3 LuaParser/include/LuaParser/Ast/LuaSyntaxTree.h
+2 −2 LuaParser/include/LuaParser/Ast/NodeOrToken.h
+2 −2 LuaParser/include/LuaParser/File/LuaFile.h
+3 −1 LuaParser/include/LuaParser/Lexer/LuaLexer.h
+1 −1 LuaParser/include/LuaParser/Lexer/LuaToken.h
+1 −1 LuaParser/include/LuaParser/Lexer/LuaTokenError.h
+1 −1 LuaParser/include/LuaParser/Lexer/TextReader.h
+184 −50 LuaParser/src/Lexer/LuaLexer.cpp
+1 −1 LuaParser/src/Parse/LuaParser.cpp
+29 −6 Test/src/Grammar_unitest.cpp
+5 −1 Test/src/TestHelper.cpp
+1 −1 Test/src/TestHelper.h
+11 −3 Test2/src/FormatTest2.cpp
10 changes: 1 addition & 9 deletions script/provider/formatting.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,8 @@ function m.updateNonStandardSymbols(symbols)
return
end

local eqTokens = {}
for _, token in ipairs(symbols) do
if token:find("=") and token ~= "!=" then
table.insert(eqTokens, token)
end
end

if #eqTokens ~= 0 then
codeFormat.set_nonstandard_symbol()
end
codeFormat.set_nonstandard_symbol()
end

config.watch(function(uri, key, value)
Expand Down