Skip to content

编辑器设置优先 #962

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
Feb 22, 2022
Merged

编辑器设置优先 #962

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
aa13aba
编辑器设置优先
CppCXY Feb 22, 2022
c920f96
Merge branch 'master' of https://github.com/sumneko/lua-language-server
CppCXY Feb 22, 2022
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 3 files
+1 −1 CodeFormatLib/src/CodeFormatLib.cpp
+40 −50 CodeFormatLib/src/LuaCodeFormat.cpp
+2 −0 CodeFormatLib/src/LuaCodeFormat.h
8 changes: 4 additions & 4 deletions script/core/formatting.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
local codeFormat = require("code_format")
local files = require("files")
local log = require("log")
local files = require("files")
local log = require("log")

return function(uri)
return function(uri, options)
local text = files.getText(uri)
local ast = files.getState(uri)
local status, formattedText = codeFormat.format(uri, text)
local status, formattedText = codeFormat.format(uri, text, options)

if not status then
if formattedText ~= nil then
Expand Down
4 changes: 2 additions & 2 deletions script/core/rangeformatting.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ local files = require("files")
local log = require("log")
local converter = require("proto.converter")

return function(uri, range)
return function(uri, range, options)
local text = files.getText(uri)
local status, formattedText, startLine, endLine = codeFormat.range_format(
uri, text, range.start.line, range["end"].line)
uri, text, range.start.line, range["end"].line, options)

if not status then
if formattedText ~= nil then
Expand Down
4 changes: 2 additions & 2 deletions script/provider/provider.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ m.register 'textDocument/formatting' {
pformatting.updateConfig(uri)

local core = require 'core.formatting'
local edits = core(uri)
local edits = core(uri, params.options)
if not edits or #edits == 0 then
return nil
end
Expand Down Expand Up @@ -1058,7 +1058,7 @@ m.register 'textDocument/rangeFormatting' {
pformatting.updateConfig(uri)

local core = require 'core.rangeformatting'
local edits = core(uri, params.range)
local edits = core(uri, params.range, params.options)
if not edits or #edits == 0 then
return nil
end
Expand Down