Skip to content

Commit 4682c70

Browse files
authored
Merge branch 'master' into master
2 parents ee2d0ec + 2c884a6 commit 4682c70

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Unreleased
44
<!-- Add all new changes here. They will be moved under a version at release -->
55
* `FIX` Correct `math.type` meta return annotation to use `nil` instead of the string literal `'nil'`
6+
* `FIX` Fix initial `nameStyle.config` not getting loaded in the appropriate workspace.
67

78
## 3.18.2
89
* `CHG` `duplicate-set-field` diagnostic now supports linked suppression: when any occurrence of a duplicate field is suppressed with `---@diagnostic disable` or `---@diagnostic disable-next-line`, all warnings for that field name will be suppressed

meta/template/os.lua

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ function os.clock() end
1111

1212
---@class osdate:osdateparam
1313
---#DES 'osdate.year'
14-
---@field year integer|string
14+
---@field year integer
1515
---#DES 'osdate.month'
16-
---@field month integer|string
16+
---@field month integer
1717
---#DES 'osdate.day'
18-
---@field day integer|string
18+
---@field day integer
1919
---#DES 'osdate.hour'
20-
---@field hour integer|string
20+
---@field hour integer
2121
---#DES 'osdate.min'
22-
---@field min integer|string
22+
---@field min integer
2323
---#DES 'osdate.sec'
24-
---@field sec integer|string
24+
---@field sec integer
2525
---#DES 'osdate.wday'
26-
---@field wday integer|string
26+
---@field wday integer
2727
---#DES 'osdate.yday'
28-
---@field yday integer|string
28+
---@field yday integer
2929
---#DES 'osdate.isdst'
30-
---@field isdst boolean
30+
---@field isdst boolean?
3131

3232
---#DES 'os.date'
3333
---@param format? string

script/provider/name-style.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ m.loaded = false
1111

1212
function m.nameStyleCheck(uri, text)
1313
if not m.loaded then
14-
local value = config.get(nil, "Lua.nameStyle.config")
14+
local value = config.get(uri, "Lua.nameStyle.config")
1515
codeFormat.update_name_style_config(value)
1616
m.loaded = true
1717
end

0 commit comments

Comments
 (0)