Skip to content

Commit 18691bd

Browse files
authored
Merge branch 'master' into master
2 parents 8148c37 + e8dd3c3 commit 18691bd

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

3rd/bee.lua

changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
1717
}
1818
```
1919
* `CHG` [#1177] re-support for symlinks, users need to maintain the correctness of symlinks themselves
20+
* `FIX` [#1593]
2021

2122
[#1177]: https://github.com/sumneko/lua-language-server/issues/1177
2223
[#1458]: https://github.com/sumneko/lua-language-server/issues/1458
2324
[#1557]: https://github.com/sumneko/lua-language-server/issues/1557
2425
[#1558]: https://github.com/sumneko/lua-language-server/issues/1558
26+
[#1593]: https://github.com/sumneko/lua-language-server/issues/1593
2527

2628
## 3.5.6
2729
`2022-9-16`

script/filewatch.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ m._eventList = {}
2929
m._watchings = {}
3030

3131
function m.watch(path)
32+
if path == '' then
33+
return function () end
34+
end
3235
if m._watchings[path] then
3336
m._watchings[path].count = m._watchings[path].count + 1
3437
else

script/parser/luadoc.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,10 +1494,14 @@ local function buildLuaDoc(comment)
14941494
comment = comment,
14951495
}
14961496
end
1497+
local startOffset = comment.start
1498+
if comment.type == 'comment.long' then
1499+
startOffset = startOffset + #comment.mark - 2
1500+
end
14971501

14981502
local doc = text:sub(startPos)
14991503

1500-
parseTokens(doc, comment.start + startPos)
1504+
parseTokens(doc, startOffset + startPos)
15011505
local result, rests = convertTokens(doc)
15021506
if result then
15031507
result.range = comment.finish

0 commit comments

Comments
 (0)