Myzel394/config-lsp
1
0
Fork 0
mirror of https://github.com/Myzel394/config-lsp.git synced 2025-06-19 07:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Bugfixes

Browse Source
This commit is contained in:
Myzel394 2024-09-14 21:08:46 +02:00
parent be8c92f605
commit d3b655dc68
No known key found for this signature in database
GPG Key ID: DEC4AAB876F73185
9 changed files with 116 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
doc-values/value-array.go
View File

@ -119,24 +119,34 @@ func (v ArrayValue) getCurrentValue(line string, cursor uint32) (string, uint32)
return line, cursor return line, cursor
} }
MIN := uint32(0)
MAX := uint32(len(line) - 1)
var start uint32 var start uint32
var end uint32 var end uint32
// hello,w[o]rld,and,more
// [h]ello,world
// hello,[w]orld
// hell[o],world
// hello,worl[d]
// hello,world[,]
// hello[,]world,how,are,you
relativePosition, found := utils.FindPreviousCharacter( relativePosition, found := utils.FindPreviousCharacter(
line, line,
v.Separator, v.Separator,
// defaults int(cursor),
min(len(line)-1, int(cursor)-1),
) )
if found { if found {
// +1 to skip the separator // + 1 to skip the separator
start = min( start = min(
min(uint32(len(line)), uint32(relativePosition+1)), MAX,
uint32(relativePosition+1), uint32(relativePosition)+1,
) )
} else { } else {
start = 0 start = MIN
} }
relativePosition, found = utils.FindNextCharacter( relativePosition, found = utils.FindNextCharacter(
@ -146,21 +156,27 @@ func (v ArrayValue) getCurrentValue(line string, cursor uint32) (string, uint32)
) )
if found { if found {
// -1 to skip the separator // - 1 to skip the separator
end = min( end = max(
min(uint32(len(line)), uint32(relativePosition)), MIN,
cursor, uint32(relativePosition)-1,
) )
} else { } else {
end = uint32(len(line)) end = MAX
} }
return line[start:end], cursor - start if cursor > end {
// The user is typing a new (yet empty) value
return "", 0
}
return line[start : end+1], cursor - start
} }
func (v ArrayValue) FetchCompletions(line string, cursor uint32) []protocol.CompletionItem { func (v ArrayValue) FetchCompletions(line string, cursor uint32) []protocol.CompletionItem {
value, cursor := v.getCurrentValue(line, cursor) value, cursor := v.getCurrentValue(line, cursor)
println("after array", value, cursor)
return v.SubValue.FetchCompletions(value, cursor) return v.SubValue.FetchCompletions(value, cursor)
} }

2
doc-values/value-key-enum-assignment.go
View File

@ -173,7 +173,7 @@ func (v KeyEnumAssignmentValue) FetchCompletions(line string, cursor uint32) []p
relativePosition, found := utils.FindPreviousCharacter( relativePosition, found := utils.FindPreviousCharacter(
line, line,
v.Separator, v.Separator,
max(0, int(cursor-1)), int(cursor),
) )
if found { if found {

2
doc-values/value-key-value-assignment.go
View File

@ -111,7 +111,7 @@ func (v KeyValueAssignmentValue) FetchCompletions(line string, cursor uint32) []
relativePosition, found := utils.FindPreviousCharacter( relativePosition, found := utils.FindPreviousCharacter(
line, line,
v.Separator, v.Separator,
max(0, int(cursor-1)), int(cursor),
) )
if found { if found {

2
doc-values/value-or.go
View File

@ -63,7 +63,7 @@ func (v OrValue) FetchCompletions(line string, cursor uint32) []protocol.Complet
_, found := utils.FindPreviousCharacter( _, found := utils.FindPreviousCharacter(
line, line,
keyEnumValue.Separator, keyEnumValue.Separator,
int(cursor-1), int(cursor),
) )
if found { if found {

4
handlers/sshd_config/Config.g4
View File

@ -5,7 +5,7 @@ lineStatement
; ;
entry entry
: WHITESPACE? key? separator? value? WHITESPACE? leadingComment? : WHITESPACE? key? separator? value? leadingComment?
; ;
separator separator
@ -17,7 +17,7 @@ key
; ;
value value
: (STRING WHITESPACE)? STRING : (STRING WHITESPACE)? STRING WHITESPACE?
; ;
leadingComment leadingComment

2
handlers/sshd_config/ast/parser/Config.interp
View File

@ -22,4 +22,4 @@ leadingComment
atn: atn:
[4, 1, 4, 65, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 1, 0, 1, 0, 3, 0, 15, 8, 0, 1, 0, 1, 0, 3, 0, 19, 8, 0, 3, 0, 21, 8, 0, 1, 0, 1, 0, 1, 1, 3, 1, 26, 8, 1, 1, 1, 3, 1, 29, 8, 1, 1, 1, 3, 1, 32, 8, 1, 1, 1, 3, 1, 35, 8, 1, 1, 1, 3, 1, 38, 8, 1, 1, 1, 3, 1, 41, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 49, 8, 4, 1, 4, 1, 4, 1, 5, 1, 5, 3, 5, 55, 8, 5, 1, 5, 1, 5, 3, 5, 59, 8, 5, 4, 5, 61, 8, 5, 11, 5, 12, 5, 62, 1, 5, 0, 0, 6, 0, 2, 4, 6, 8, 10, 0, 0, 72, 0, 20, 1, 0, 0, 0, 2, 25, 1, 0, 0, 0, 4, 42, 1, 0, 0, 0, 6, 44, 1, 0, 0, 0, 8, 48, 1, 0, 0, 0, 10, 52, 1, 0, 0, 0, 12, 21, 3, 2, 1, 0, 13, 15, 5, 2, 0, 0, 14, 13, 1, 0, 0, 0, 14, 15, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 21, 3, 10, 5, 0, 17, 19, 5, 2, 0, 0, 18, 17, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 19, 21, 1, 0, 0, 0, 20, 12, 1, 0, 0, 0, 20, 14, 1, 0, 0, 0, 20, 18, 1, 0, 0, 0, 21, 22, 1, 0, 0, 0, 22, 23, 5, 0, 0, 1, 23, 1, 1, 0, 0, 0, 24, 26, 5, 2, 0, 0, 25, 24, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 28, 1, 0, 0, 0, 27, 29, 3, 6, 3, 0, 28, 27, 1, 0, 0, 0, 28, 29, 1, 0, 0, 0, 29, 31, 1, 0, 0, 0, 30, 32, 3, 4, 2, 0, 31, 30, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 32, 34, 1, 0, 0, 0, 33, 35, 3, 8, 4, 0, 34, 33, 1, 0, 0, 0, 34, 35, 1, 0, 0, 0, 35, 37, 1, 0, 0, 0, 36, 38, 5, 2, 0, 0, 37, 36, 1, 0, 0, 0, 37, 38, 1, 0, 0, 0, 38, 40, 1, 0, 0, 0, 39, 41, 3, 10, 5, 0, 40, 39, 1, 0, 0, 0, 40, 41, 1, 0, 0, 0, 41, 3, 1, 0, 0, 0, 42, 43, 5, 2, 0, 0, 43, 5, 1, 0, 0, 0, 44, 45, 5, 3, 0, 0, 45, 7, 1, 0, 0, 0, 46, 47, 5, 3, 0, 0, 47, 49, 5, 2, 0, 0, 48, 46, 1, 0, 0, 0, 48, 49, 1, 0, 0, 0, 49, 50, 1, 0, 0, 0, 50, 51, 5, 3, 0, 0, 51, 9, 1, 0, 0, 0, 52, 54, 5, 1, 0, 0, 53, 55, 5, 2, 0, 0, 54, 53, 1, 0, 0, 0, 54, 55, 1, 0, 0, 0, 55, 60, 1, 0, 0, 0, 56, 58, 5, 3, 0, 0, 57, 59, 5, 2, 0, 0, 58, 57, 1, 0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 61, 1, 0, 0, 0, 60, 56, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 11, 1, 0, 0, 0, 13, 14, 18, 20, 25, 28, 31, 34, 37, 40, 48, 54, 58, 62] [4, 1, 4, 64, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 1, 0, 1, 0, 3, 0, 15, 8, 0, 1, 0, 1, 0, 3, 0, 19, 8, 0, 3, 0, 21, 8, 0, 1, 0, 1, 0, 1, 1, 3, 1, 26, 8, 1, 1, 1, 3, 1, 29, 8, 1, 1, 1, 3, 1, 32, 8, 1, 1, 1, 3, 1, 35, 8, 1, 1, 1, 3, 1, 38, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 46, 8, 4, 1, 4, 1, 4, 3, 4, 50, 8, 4, 1, 5, 1, 5, 3, 5, 54, 8, 5, 1, 5, 1, 5, 3, 5, 58, 8, 5, 4, 5, 60, 8, 5, 11, 5, 12, 5, 61, 1, 5, 0, 0, 6, 0, 2, 4, 6, 8, 10, 0, 0, 71, 0, 20, 1, 0, 0, 0, 2, 25, 1, 0, 0, 0, 4, 39, 1, 0, 0, 0, 6, 41, 1, 0, 0, 0, 8, 45, 1, 0, 0, 0, 10, 51, 1, 0, 0, 0, 12, 21, 3, 2, 1, 0, 13, 15, 5, 2, 0, 0, 14, 13, 1, 0, 0, 0, 14, 15, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 21, 3, 10, 5, 0, 17, 19, 5, 2, 0, 0, 18, 17, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 19, 21, 1, 0, 0, 0, 20, 12, 1, 0, 0, 0, 20, 14, 1, 0, 0, 0, 20, 18, 1, 0, 0, 0, 21, 22, 1, 0, 0, 0, 22, 23, 5, 0, 0, 1, 23, 1, 1, 0, 0, 0, 24, 26, 5, 2, 0, 0, 25, 24, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 28, 1, 0, 0, 0, 27, 29, 3, 6, 3, 0, 28, 27, 1, 0, 0, 0, 28, 29, 1, 0, 0, 0, 29, 31, 1, 0, 0, 0, 30, 32, 3, 4, 2, 0, 31, 30, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 32, 34, 1, 0, 0, 0, 33, 35, 3, 8, 4, 0, 34, 33, 1, 0, 0, 0, 34, 35, 1, 0, 0, 0, 35, 37, 1, 0, 0, 0, 36, 38, 3, 10, 5, 0, 37, 36, 1, 0, 0, 0, 37, 38, 1, 0, 0, 0, 38, 3, 1, 0, 0, 0, 39, 40, 5, 2, 0, 0, 40, 5, 1, 0, 0, 0, 41, 42, 5, 3, 0, 0, 42, 7, 1, 0, 0, 0, 43, 44, 5, 3, 0, 0, 44, 46, 5, 2, 0, 0, 45, 43, 1, 0, 0, 0, 45, 46, 1, 0, 0, 0, 46, 47, 1, 0, 0, 0, 47, 49, 5, 3, 0, 0, 48, 50, 5, 2, 0, 0, 49, 48, 1, 0, 0, 0, 49, 50, 1, 0, 0, 0, 50, 9, 1, 0, 0, 0, 51, 53, 5, 1, 0, 0, 52, 54, 5, 2, 0, 0, 53, 52, 1, 0, 0, 0, 53, 54, 1, 0, 0, 0, 54, 59, 1, 0, 0, 0, 55, 57, 5, 3, 0, 0, 56, 58, 5, 2, 0, 0, 57, 56, 1, 0, 0, 0, 57, 58, 1, 0, 0, 0, 58, 60, 1, 0, 0, 0, 59, 55, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 11, 1, 0, 0, 0, 13, 14, 18, 20, 25, 28, 31, 34, 37, 45, 49, 53, 57, 61]

152
handlers/sshd_config/ast/parser/config_parser.go
View File

@ -43,34 +43,34 @@ func configParserInit() {
} }
staticData.PredictionContextCache = antlr.NewPredictionContextCache() staticData.PredictionContextCache = antlr.NewPredictionContextCache()
staticData.serializedATN = []int32{ staticData.serializedATN = []int32{
4, 1, 4, 65, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 4, 1, 4, 64, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4,
2, 5, 7, 5, 1, 0, 1, 0, 3, 0, 15, 8, 0, 1, 0, 1, 0, 3, 0, 19, 8, 0, 3, 2, 5, 7, 5, 1, 0, 1, 0, 3, 0, 15, 8, 0, 1, 0, 1, 0, 3, 0, 19, 8, 0, 3,
0, 21, 8, 0, 1, 0, 1, 0, 1, 1, 3, 1, 26, 8, 1, 1, 1, 3, 1, 29, 8, 1, 1, 0, 21, 8, 0, 1, 0, 1, 0, 1, 1, 3, 1, 26, 8, 1, 1, 1, 3, 1, 29, 8, 1, 1,
1, 3, 1, 32, 8, 1, 1, 1, 3, 1, 35, 8, 1, 1, 1, 3, 1, 38, 8, 1, 1, 1, 3, 1, 3, 1, 32, 8, 1, 1, 1, 3, 1, 35, 8, 1, 1, 1, 3, 1, 38, 8, 1, 1, 2, 1,
1, 41, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 49, 8, 4, 1, 4, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 46, 8, 4, 1, 4, 1, 4, 3, 4, 50, 8, 4,
1, 4, 1, 5, 1, 5, 3, 5, 55, 8, 5, 1, 5, 1, 5, 3, 5, 59, 8, 5, 4, 5, 61, 1, 5, 1, 5, 3, 5, 54, 8, 5, 1, 5, 1, 5, 3, 5, 58, 8, 5, 4, 5, 60, 8, 5,
8, 5, 11, 5, 12, 5, 62, 1, 5, 0, 0, 6, 0, 2, 4, 6, 8, 10, 0, 0, 72, 0, 11, 5, 12, 5, 61, 1, 5, 0, 0, 6, 0, 2, 4, 6, 8, 10, 0, 0, 71, 0, 20, 1,
20, 1, 0, 0, 0, 2, 25, 1, 0, 0, 0, 4, 42, 1, 0, 0, 0, 6, 44, 1, 0, 0, 0, 0, 0, 0, 2, 25, 1, 0, 0, 0, 4, 39, 1, 0, 0, 0, 6, 41, 1, 0, 0, 0, 8, 45,
8, 48, 1, 0, 0, 0, 10, 52, 1, 0, 0, 0, 12, 21, 3, 2, 1, 0, 13, 15, 5, 2, 1, 0, 0, 0, 10, 51, 1, 0, 0, 0, 12, 21, 3, 2, 1, 0, 13, 15, 5, 2, 0, 0,
0, 0, 14, 13, 1, 0, 0, 0, 14, 15, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 21, 14, 13, 1, 0, 0, 0, 14, 15, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 21, 3,
3, 10, 5, 0, 17, 19, 5, 2, 0, 0, 18, 17, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 10, 5, 0, 17, 19, 5, 2, 0, 0, 18, 17, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 19,
19, 21, 1, 0, 0, 0, 20, 12, 1, 0, 0, 0, 20, 14, 1, 0, 0, 0, 20, 18, 1, 21, 1, 0, 0, 0, 20, 12, 1, 0, 0, 0, 20, 14, 1, 0, 0, 0, 20, 18, 1, 0, 0,
0, 0, 0, 21, 22, 1, 0, 0, 0, 22, 23, 5, 0, 0, 1, 23, 1, 1, 0, 0, 0, 24, 0, 21, 22, 1, 0, 0, 0, 22, 23, 5, 0, 0, 1, 23, 1, 1, 0, 0, 0, 24, 26, 5,
26, 5, 2, 0, 0, 25, 24, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 28, 1, 0, 0, 2, 0, 0, 25, 24, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 28, 1, 0, 0, 0, 27,
0, 27, 29, 3, 6, 3, 0, 28, 27, 1, 0, 0, 0, 28, 29, 1, 0, 0, 0, 29, 31, 29, 3, 6, 3, 0, 28, 27, 1, 0, 0, 0, 28, 29, 1, 0, 0, 0, 29, 31, 1, 0, 0,
1, 0, 0, 0, 30, 32, 3, 4, 2, 0, 31, 30, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 0, 30, 32, 3, 4, 2, 0, 31, 30, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 32, 34,
32, 34, 1, 0, 0, 0, 33, 35, 3, 8, 4, 0, 34, 33, 1, 0, 0, 0, 34, 35, 1, 1, 0, 0, 0, 33, 35, 3, 8, 4, 0, 34, 33, 1, 0, 0, 0, 34, 35, 1, 0, 0, 0,
0, 0, 0, 35, 37, 1, 0, 0, 0, 36, 38, 5, 2, 0, 0, 37, 36, 1, 0, 0, 0, 37, 35, 37, 1, 0, 0, 0, 36, 38, 3, 10, 5, 0, 37, 36, 1, 0, 0, 0, 37, 38, 1,
38, 1, 0, 0, 0, 38, 40, 1, 0, 0, 0, 39, 41, 3, 10, 5, 0, 40, 39, 1, 0, 0, 0, 0, 38, 3, 1, 0, 0, 0, 39, 40, 5, 2, 0, 0, 40, 5, 1, 0, 0, 0, 41,
0, 0, 40, 41, 1, 0, 0, 0, 41, 3, 1, 0, 0, 0, 42, 43, 5, 2, 0, 0, 43, 5, 42, 5, 3, 0, 0, 42, 7, 1, 0, 0, 0, 43, 44, 5, 3, 0, 0, 44, 46, 5, 2, 0,
1, 0, 0, 0, 44, 45, 5, 3, 0, 0, 45, 7, 1, 0, 0, 0, 46, 47, 5, 3, 0, 0, 0, 45, 43, 1, 0, 0, 0, 45, 46, 1, 0, 0, 0, 46, 47, 1, 0, 0, 0, 47, 49,
47, 49, 5, 2, 0, 0, 48, 46, 1, 0, 0, 0, 48, 49, 1, 0, 0, 0, 49, 50, 1, 5, 3, 0, 0, 48, 50, 5, 2, 0, 0, 49, 48, 1, 0, 0, 0, 49, 50, 1, 0, 0, 0,
0, 0, 0, 50, 51, 5, 3, 0, 0, 51, 9, 1, 0, 0, 0, 52, 54, 5, 1, 0, 0, 53, 50, 9, 1, 0, 0, 0, 51, 53, 5, 1, 0, 0, 52, 54, 5, 2, 0, 0, 53, 52, 1, 0,
55, 5, 2, 0, 0, 54, 53, 1, 0, 0, 0, 54, 55, 1, 0, 0, 0, 55, 60, 1, 0, 0, 0, 0, 53, 54, 1, 0, 0, 0, 54, 59, 1, 0, 0, 0, 55, 57, 5, 3, 0, 0, 56, 58,
0, 56, 58, 5, 3, 0, 0, 57, 59, 5, 2, 0, 0, 58, 57, 1, 0, 0, 0, 58, 59, 5, 2, 0, 0, 57, 56, 1, 0, 0, 0, 57, 58, 1, 0, 0, 0, 58, 60, 1, 0, 0, 0,
1, 0, 0, 0, 59, 61, 1, 0, 0, 0, 60, 56, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 59, 55, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 61, 62, 1,
62, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 11, 1, 0, 0, 0, 13, 14, 18, 0, 0, 0, 62, 11, 1, 0, 0, 0, 13, 14, 18, 20, 25, 28, 31, 34, 37, 45, 49,
20, 25, 28, 31, 34, 37, 40, 48, 54, 58, 62, 53, 57, 61,
} }
deserializer := antlr.NewATNDeserializer(nil) deserializer := antlr.NewATNDeserializer(nil)
staticData.atn = deserializer.Deserialize(staticData.serializedATN) staticData.atn = deserializer.Deserialize(staticData.serializedATN)
@ -330,8 +330,7 @@ type IEntryContext interface {
GetParser() antlr.Parser GetParser() antlr.Parser
// Getter signatures // Getter signatures
AllWHITESPACE() []antlr.TerminalNode WHITESPACE() antlr.TerminalNode
WHITESPACE(i int) antlr.TerminalNode
Key() IKeyContext Key() IKeyContext
Separator() ISeparatorContext Separator() ISeparatorContext
Value() IValueContext Value() IValueContext
@ -373,12 +372,8 @@ func NewEntryContext(parser antlr.Parser, parent antlr.ParserRuleContext, invoki
func (s *EntryContext) GetParser() antlr.Parser { return s.parser } func (s *EntryContext) GetParser() antlr.Parser { return s.parser }
func (s *EntryContext) AllWHITESPACE() []antlr.TerminalNode { func (s *EntryContext) WHITESPACE() antlr.TerminalNode {
return s.GetTokens(ConfigParserWHITESPACE) return s.GetToken(ConfigParserWHITESPACE, 0)
}
func (s *EntryContext) WHITESPACE(i int) antlr.TerminalNode {
return s.GetToken(ConfigParserWHITESPACE, i)
} }
func (s *EntryContext) Key() IKeyContext { func (s *EntryContext) Key() IKeyContext {
@ -501,15 +496,17 @@ func (p *ConfigParser) Entry() (localctx IEntryContext) {
} }
p.SetState(31) p.SetState(31)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
if p.HasError() {
goto errorExit
}
_la = p.GetTokenStream().LA(1)
if p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 5, p.GetParserRuleContext()) == 1 { if _la == ConfigParserWHITESPACE {
{ {
p.SetState(30) p.SetState(30)
p.Separator() p.Separator()
} }
} else if p.HasError() { // JIM
goto errorExit
} }
p.SetState(34) p.SetState(34)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
@ -532,27 +529,9 @@ func (p *ConfigParser) Entry() (localctx IEntryContext) {
} }
_la = p.GetTokenStream().LA(1) _la = p.GetTokenStream().LA(1)
if _la == ConfigParserWHITESPACE {
{
p.SetState(36)
p.Match(ConfigParserWHITESPACE)
if p.HasError() {
// Recognition error - abort rule
goto errorExit
}
}
}
p.SetState(40)
p.GetErrorHandler().Sync(p)
if p.HasError() {
goto errorExit
}
_la = p.GetTokenStream().LA(1)
if _la == ConfigParserHASH { if _la == ConfigParserHASH {
{ {
p.SetState(39) p.SetState(36)
p.LeadingComment() p.LeadingComment()
} }
@ -646,7 +625,7 @@ func (p *ConfigParser) Separator() (localctx ISeparatorContext) {
p.EnterRule(localctx, 4, ConfigParserRULE_separator) p.EnterRule(localctx, 4, ConfigParserRULE_separator)
p.EnterOuterAlt(localctx, 1) p.EnterOuterAlt(localctx, 1)
{ {
p.SetState(42) p.SetState(39)
p.Match(ConfigParserWHITESPACE) p.Match(ConfigParserWHITESPACE)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
@ -742,7 +721,7 @@ func (p *ConfigParser) Key() (localctx IKeyContext) {
p.EnterRule(localctx, 6, ConfigParserRULE_key) p.EnterRule(localctx, 6, ConfigParserRULE_key)
p.EnterOuterAlt(localctx, 1) p.EnterOuterAlt(localctx, 1)
{ {
p.SetState(44) p.SetState(41)
p.Match(ConfigParserSTRING) p.Match(ConfigParserSTRING)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
@ -773,7 +752,8 @@ type IValueContext interface {
// Getter signatures // Getter signatures
AllSTRING() []antlr.TerminalNode AllSTRING() []antlr.TerminalNode
STRING(i int) antlr.TerminalNode STRING(i int) antlr.TerminalNode
WHITESPACE() antlr.TerminalNode AllWHITESPACE() []antlr.TerminalNode
WHITESPACE(i int) antlr.TerminalNode
// IsValueContext differentiates from other interfaces. // IsValueContext differentiates from other interfaces.
IsValueContext() IsValueContext()
@ -819,8 +799,12 @@ func (s *ValueContext) STRING(i int) antlr.TerminalNode {
return s.GetToken(ConfigParserSTRING, i) return s.GetToken(ConfigParserSTRING, i)
} }
func (s *ValueContext) WHITESPACE() antlr.TerminalNode { func (s *ValueContext) AllWHITESPACE() []antlr.TerminalNode {
return s.GetToken(ConfigParserWHITESPACE, 0) return s.GetTokens(ConfigParserWHITESPACE)
}
func (s *ValueContext) WHITESPACE(i int) antlr.TerminalNode {
return s.GetToken(ConfigParserWHITESPACE, i)
} }
func (s *ValueContext) GetRuleContext() antlr.RuleContext { func (s *ValueContext) GetRuleContext() antlr.RuleContext {
@ -846,13 +830,15 @@ func (s *ValueContext) ExitRule(listener antlr.ParseTreeListener) {
func (p *ConfigParser) Value() (localctx IValueContext) { func (p *ConfigParser) Value() (localctx IValueContext) {
localctx = NewValueContext(p, p.GetParserRuleContext(), p.GetState()) localctx = NewValueContext(p, p.GetParserRuleContext(), p.GetState())
p.EnterRule(localctx, 8, ConfigParserRULE_value) p.EnterRule(localctx, 8, ConfigParserRULE_value)
var _la int
p.EnterOuterAlt(localctx, 1) p.EnterOuterAlt(localctx, 1)
p.SetState(48) p.SetState(45)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
if p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 9, p.GetParserRuleContext()) == 1 { if p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 8, p.GetParserRuleContext()) == 1 {
{ {
p.SetState(46) p.SetState(43)
p.Match(ConfigParserSTRING) p.Match(ConfigParserSTRING)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
@ -860,7 +846,7 @@ func (p *ConfigParser) Value() (localctx IValueContext) {
} }
} }
{ {
p.SetState(47) p.SetState(44)
p.Match(ConfigParserWHITESPACE) p.Match(ConfigParserWHITESPACE)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
@ -872,13 +858,31 @@ func (p *ConfigParser) Value() (localctx IValueContext) {
goto errorExit goto errorExit
} }
{ {
p.SetState(50) p.SetState(47)
p.Match(ConfigParserSTRING) p.Match(ConfigParserSTRING)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
goto errorExit goto errorExit
} }
} }
p.SetState(49)
p.GetErrorHandler().Sync(p)
if p.HasError() {
goto errorExit
}
_la = p.GetTokenStream().LA(1)
if _la == ConfigParserWHITESPACE {
{
p.SetState(48)
p.Match(ConfigParserWHITESPACE)
if p.HasError() {
// Recognition error - abort rule
goto errorExit
}
}
}
errorExit: errorExit:
if p.HasError() { if p.HasError() {
@ -990,14 +994,14 @@ func (p *ConfigParser) LeadingComment() (localctx ILeadingCommentContext) {
p.EnterOuterAlt(localctx, 1) p.EnterOuterAlt(localctx, 1)
{ {
p.SetState(52) p.SetState(51)
p.Match(ConfigParserHASH) p.Match(ConfigParserHASH)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
goto errorExit goto errorExit
} }
} }
p.SetState(54) p.SetState(53)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
if p.HasError() { if p.HasError() {
goto errorExit goto errorExit
@ -1006,7 +1010,7 @@ func (p *ConfigParser) LeadingComment() (localctx ILeadingCommentContext) {
if _la == ConfigParserWHITESPACE { if _la == ConfigParserWHITESPACE {
{ {
p.SetState(53) p.SetState(52)
p.Match(ConfigParserWHITESPACE) p.Match(ConfigParserWHITESPACE)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
@ -1015,7 +1019,7 @@ func (p *ConfigParser) LeadingComment() (localctx ILeadingCommentContext) {
} }
} }
p.SetState(60) p.SetState(59)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
if p.HasError() { if p.HasError() {
goto errorExit goto errorExit
@ -1024,14 +1028,14 @@ func (p *ConfigParser) LeadingComment() (localctx ILeadingCommentContext) {
for ok := true; ok; ok = _la == ConfigParserSTRING { for ok := true; ok; ok = _la == ConfigParserSTRING {
{ {
p.SetState(56) p.SetState(55)
p.Match(ConfigParserSTRING) p.Match(ConfigParserSTRING)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
goto errorExit goto errorExit
} }
} }
p.SetState(58) p.SetState(57)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
if p.HasError() { if p.HasError() {
goto errorExit goto errorExit
@ -1040,7 +1044,7 @@ func (p *ConfigParser) LeadingComment() (localctx ILeadingCommentContext) {
if _la == ConfigParserWHITESPACE { if _la == ConfigParserWHITESPACE {
{ {
p.SetState(57) p.SetState(56)
p.Match(ConfigParserWHITESPACE) p.Match(ConfigParserWHITESPACE)
if p.HasError() { if p.HasError() {
// Recognition error - abort rule // Recognition error - abort rule
@ -1050,7 +1054,7 @@ func (p *ConfigParser) LeadingComment() (localctx ILeadingCommentContext) {
} }
p.SetState(62) p.SetState(61)
p.GetErrorHandler().Sync(p) p.GetErrorHandler().Sync(p)
if p.HasError() { if p.HasError() {
goto errorExit goto errorExit

4
handlers/sshd_config/fields/fields.go
View File

@ -572,8 +572,8 @@ Only a subset of keywords may be used on the lines following a Match keyword. Av
SubValue: docvalues.KeyEnumAssignmentValue{ SubValue: docvalues.KeyEnumAssignmentValue{
Separator: " ", Separator: " ",
Values: map[docvalues.EnumString]docvalues.Value{ Values: map[docvalues.EnumString]docvalues.Value{
docvalues.CreateEnumString("User"): docvalues.StringValue{}, docvalues.CreateEnumString("User"): docvalues.UserValue("", false),
docvalues.CreateEnumString("Group"): docvalues.StringValue{}, docvalues.CreateEnumString("Group"): docvalues.GroupValue("", false),
docvalues.CreateEnumString("Host"): docvalues.StringValue{}, docvalues.CreateEnumString("Host"): docvalues.StringValue{},
docvalues.CreateEnumString("LocalAddress"): docvalues.StringValue{}, docvalues.CreateEnumString("LocalAddress"): docvalues.StringValue{},
docvalues.CreateEnumString("LocalPort"): docvalues.NumberValue{Min: &ZERO, Max: &MAX_PORT}, docvalues.CreateEnumString("LocalPort"): docvalues.NumberValue{Min: &ZERO, Max: &MAX_PORT},

3
handlers/sshd_config/handlers/completions.go
View File

@ -1,6 +1,7 @@
package handlers package handlers
import ( import (
"config-lsp/common"
docvalues "config-lsp/doc-values" docvalues "config-lsp/doc-values"
sshdconfig "config-lsp/handlers/sshd_config" sshdconfig "config-lsp/handlers/sshd_config"
"config-lsp/handlers/sshd_config/ast" "config-lsp/handlers/sshd_config/ast"
@ -66,7 +67,7 @@ func GetOptionCompletions(
return option.FetchCompletions("", 0), nil return option.FetchCompletions("", 0), nil
} }
relativeCursor := cursor - entry.OptionValue.Start.Character relativeCursor := common.CursorToCharacterIndex(cursor - entry.OptionValue.Start.Character)
line := entry.OptionValue.Value line := entry.OptionValue.Value
return option.FetchCompletions(line, relativeCursor), nil return option.FetchCompletions(line, relativeCursor), nil