diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle index f580f0ddf..da71a27a8 160000 --- a/3rd/EmmyLuaCodeStyle +++ b/3rd/EmmyLuaCodeStyle @@ -1 +1 @@ -Subproject commit f580f0ddfcd78982882d0686f69fa18a63465b41 +Subproject commit da71a27a82d36c4c8b031f9d53ca6935894970bb diff --git a/script/core/formatting.lua b/script/core/formatting.lua index 6c57b8c23..49da68614 100644 --- a/script/core/formatting.lua +++ b/script/core/formatting.lua @@ -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 diff --git a/script/core/rangeformatting.lua b/script/core/rangeformatting.lua index de9516c11..ccf2d21fa 100644 --- a/script/core/rangeformatting.lua +++ b/script/core/rangeformatting.lua @@ -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 diff --git a/script/provider/provider.lua b/script/provider/provider.lua index 5672c10c2..3e8fec24b 100644 --- a/script/provider/provider.lua +++ b/script/provider/provider.lua @@ -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 @@ -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