Skip to content

Commit bed1187

Browse files
sumnekosumneko
committed
fix incorrect indent fixings
fix #2799
1 parent 2fe2ff3 commit bed1187

File tree

4 files changed

+38
-53
lines changed

4 files changed

+38
-53
lines changed

‎changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* `NEW` Add matching checks between the shape of tables and classes, during type checking. [#2768](https://github.com/LuaLS/lua-language-server/pull/2768)
66
* `FIX` Error `attempt to index a nil value` when `Lua.hint.semicolon == 'All'` [#2788](https://github.com/LuaLS/lua-language-server/issues/2788)
77
* `FIX` Incorrect LuaCats parsing for `"'"`
8+
* `FIX` Incorrect indent fixings
89

910
## 3.10.3
1011
`2024-8-8`

‎script/core/fix-indent.lua

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -60,59 +60,20 @@ local function getIndent(state, row)
6060
return indent
6161
end
6262

63-
local function isInBlock(state, position)
64-
local block = guide.eachSourceContain(state.ast, position, function(source)
65-
if source.type == 'ifblock'
66-
or source.type == 'elseifblock' then
67-
if source.keyword[4] and source.keyword[4] <= position then
68-
return true
69-
end
70-
end
71-
if source.type == 'else' then
72-
if source.keyword[2] and source.keyword[2] <= position then
73-
return true
74-
end
75-
end
76-
if source.type == 'while' then
77-
if source.keyword[4] and source.keyword[4] <= position then
78-
return true
79-
end
80-
end
81-
if source.type == 'repeat' then
82-
if source.keyword[2] and source.keyword[2] <= position then
83-
return true
84-
end
85-
end
86-
if source.type == 'loop' then
87-
if source.keyword[4] and source.keyword[4] <= position then
88-
return true
89-
end
90-
end
91-
if source.type == 'in' then
92-
if source.keyword[6] and source.keyword[6] <= position then
93-
return true
94-
end
95-
end
96-
if source.type == 'do' then
97-
if source.keyword[2] and source.keyword[2] <= position then
98-
return true
99-
end
100-
end
101-
if source.type == 'function' then
102-
if source.args and source.args.finish <= position then
103-
return true
104-
end
105-
if not source.keyword[3] or source.keyword[3] >= position then
106-
return true
107-
end
63+
---@param state parser.state
64+
---@param pos integer
65+
---@return parser.object
66+
local function getBlock(state, pos)
67+
local block
68+
guide.eachSourceContain(state.ast, pos, function (src)
69+
if not src.bstart then
70+
return
10871
end
109-
if source.type == 'table' then
110-
if source.start + 1 == position then
111-
return true
112-
end
72+
if not block or block.bstart < src.bstart then
73+
block = src
11374
end
11475
end)
115-
return block ~= nil
76+
return block
11677
end
11778

11879
local function fixWrongIndent(state, change)
@@ -135,7 +96,8 @@ local function fixWrongIndent(state, change)
13596
if not util.stringStartWith(myIndent, lastIndent) then
13697
return
13798
end
138-
if isInBlock(state, lastPosition) then
99+
local myBlock = getBlock(state, position)
100+
if myBlock.bstart >= lastOffset then
139101
return
140102
end
141103

‎script/parser/compile.lua

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,6 +1585,7 @@ local function parseTable()
15851585
start = getPosition(Tokens[Index], 'left'),
15861586
finish = getPosition(Tokens[Index], 'right'),
15871587
}
1588+
tbl.bstart = tbl.finish
15881589
Index = Index + 2
15891590
local index = 0
15901591
local tindex = 0
@@ -1593,6 +1594,7 @@ local function parseTable()
15931594
skipSpace(true)
15941595
local token = Tokens[Index + 1]
15951596
if token == '}' then
1597+
tbl.bfinish = getPosition(Tokens[Index], 'left')
15961598
Index = Index + 2
15971599
break
15981600
end
@@ -1712,6 +1714,8 @@ local function parseTable()
17121714
end
17131715

17141716
missSymbol '}'
1717+
skipSpace()
1718+
tbl.bfinish = getPosition(Tokens[Index], 'left')
17151719
break
17161720
::CONTINUE::
17171721
end
@@ -2379,6 +2383,7 @@ local function parseFunction(isLocal, isAction)
23792383
end
23802384
parseActions()
23812385
popChunk()
2386+
func.bfinish = getPosition(Tokens[Index], 'left')
23822387
if Tokens[Index + 1] == 'end' then
23832388
local endLeft = getPosition(Tokens[Index], 'left')
23842389
local endRight = getPosition(Tokens[Index] + 2, 'right')
@@ -2464,7 +2469,8 @@ local function parseLambda(isDoublePipe)
24642469
start = child.start,
24652470
finish = child.finish,
24662471
parent = lambda,
2467-
[1] = child}
2472+
[1] = child
2473+
}
24682474
child.parent = rtn
24692475
lambda[1] = rtn
24702476
lambda.returns = {rtn}
@@ -2475,6 +2481,7 @@ local function parseLambda(isDoublePipe)
24752481
lambda.finish = lastRightPosition()
24762482
missExp()
24772483
end
2484+
lambda.bfinish = getPosition(Tokens[Index], 'left')
24782485
LocalCount = LastLocalCount
24792486
return lambda
24802487
end
@@ -3131,6 +3138,7 @@ local function parseDo()
31313138
pushChunk(obj)
31323139
parseActions()
31333140
popChunk()
3141+
obj.bfinish = getPosition(Tokens[Index], 'left')
31343142
if Tokens[Index + 1] == 'end' then
31353143
obj.finish = getPosition(Tokens[Index] + 2, 'right')
31363144
obj.keyword[3] = getPosition(Tokens[Index], 'left')
@@ -3350,6 +3358,7 @@ local function parseIfBlock(parent)
33503358
parseActions()
33513359
popChunk()
33523360
ifblock.finish = getPosition(Tokens[Index], 'left')
3361+
ifblock.bfinish = ifblock.finish
33533362
if ifblock.locals then
33543363
LocalCount = LocalCount - #ifblock.locals
33553364
end
@@ -3412,6 +3421,7 @@ local function parseElseIfBlock(parent)
34123421
parseActions()
34133422
popChunk()
34143423
elseifblock.finish = getPosition(Tokens[Index], 'left')
3424+
elseifblock.bfinish = elseifblock.finish
34153425
if elseifblock.locals then
34163426
LocalCount = LocalCount - #elseifblock.locals
34173427
end
@@ -3438,6 +3448,7 @@ local function parseElseBlock(parent)
34383448
parseActions()
34393449
popChunk()
34403450
elseblock.finish = getPosition(Tokens[Index], 'left')
3451+
elseblock.bfinish = elseblock.finish
34413452
if elseblock.locals then
34423453
LocalCount = LocalCount - #elseblock.locals
34433454
end
@@ -3680,8 +3691,8 @@ local function parseFor()
36803691
skipSpace()
36813692
parseActions()
36823693
popChunk()
3683-
36843694
skipSpace()
3695+
action.bfinish = getPosition(Tokens[Index], 'left')
36853696
if Tokens[Index + 1] == 'end' then
36863697
action.finish = getPosition(Tokens[Index] + 2, 'right')
36873698
action.keyword[#action.keyword+1] = getPosition(Tokens[Index], 'left')
@@ -3763,6 +3774,7 @@ local function parseWhile()
37633774
popChunk()
37643775

37653776
skipSpace()
3777+
action.bfinish = getPosition(Tokens[Index], 'left')
37663778
if Tokens[Index + 1] == 'end' then
37673779
action.finish = getPosition(Tokens[Index] + 2, 'right')
37683780
action.keyword[#action.keyword+1] = getPosition(Tokens[Index], 'left')
@@ -3797,6 +3809,7 @@ local function parseRepeat()
37973809
parseActions()
37983810

37993811
skipSpace()
3812+
action.bfinish = getPosition(Tokens[Index], 'left')
38003813
if Tokens[Index + 1] == 'until' then
38013814
action.finish = getPosition(Tokens[Index] + 4, 'right')
38023815
action.keyword[#action.keyword+1] = getPosition(Tokens[Index], 'left')
@@ -3989,6 +4002,7 @@ local function parseLua()
39894002
type = 'main',
39904003
start = 0,
39914004
finish = 0,
4005+
bstart = 0,
39924006
}
39934007
pushChunk(main)
39944008
createLocal{
@@ -4014,6 +4028,7 @@ local function parseLua()
40144028
end
40154029
popChunk()
40164030
main.finish = getPosition(#Lua, 'right')
4031+
main.bfinish = main.finish
40174032

40184033
return main
40194034
end

‎script/parser/guide.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ local type = type
2222
---@field range integer
2323
---@field effect integer
2424
---@field bstart integer
25+
---@field bfinish integer
2526
---@field attrs string[]
2627
---@field specials parser.object[]
2728
---@field labels parser.object[]
@@ -589,6 +590,9 @@ end
589590
function m.getStartFinish(source)
590591
local start = source.start
591592
local finish = source.finish
593+
if source.bfinish and source.bfinish > finish then
594+
finish = source.bfinish
595+
end
592596
if not start then
593597
local first = source[1]
594598
if not first then
@@ -604,6 +608,9 @@ end
604608
function m.getRange(source)
605609
local start = source.vstart or source.start
606610
local finish = source.range or source.finish
611+
if source.bfinish and source.bfinish > finish then
612+
finish = source.bfinish
613+
end
607614
if not start then
608615
local first = source[1]
609616
if not first then

0 commit comments

Comments
 (0)