Myzel394/config-lsp
1
0
Fork 0
mirror of https://github.com/Myzel394/config-lsp.git synced 2025-06-18 15:05:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(aliases): Improvements

Browse Source
This commit is contained in:
Myzel394 2024-10-16 15:24:29 +02:00
parent c3d1ec3b0f
commit 92187713da
No known key found for this signature in database
GPG Key ID: ED20A1D1D423AF3F
8 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/handlers/aliases/handlers/completions.go
View File

@ -66,14 +66,14 @@ func GetCompletionsForEntry(
return completions, nil
}
switch (*value).(type) {
switch value.(type) {
case ast.AliasValueUser:
return getUserCompletions(
i,
excludedUsers,
), nil
case ast.AliasValueError:
errorValue := (*value).(ast.AliasValueError)
errorValue := value.(ast.AliasValueError)
isAtErrorCode := errorValue.Code == nil &&
errorValue.Location.IsPositionAfterStart(cursor) &&

4
server/handlers/aliases/handlers/get-value.go
View File

@ -9,7 +9,7 @@ import (
func GetValueAtPosition(
position common.Position,
entry *ast.AliasEntry,
) *ast.AliasValueInterface {
) ast.AliasValueInterface {
if entry.Values == nil || len(entry.Values.Values) == 0 {
return nil
}
@ -36,5 +36,5 @@ func GetValueAtPosition(
return nil
}
return &entry.Values.Values[index]
return entry.Values.Values[index]
}

20
server/handlers/aliases/lsp/text-document-completion.go
View File

@ -28,11 +28,7 @@ func TextDocumentCompletion(context *glsp.Context, params *protocol.CompletionPa
entry := rawEntry.(*ast.AliasEntry)
if entry.Key == nil {
return handlers.GetAliasesCompletions(d.Indexes), nil
}
if entry.Key.Location.ContainsPosition(cursor) {
if entry.Key == nil || entry.Key.Location.ContainsPosition(cursor) {
return handlers.GetAliasesCompletions(d.Indexes), nil
}
@ -40,13 +36,9 @@ func TextDocumentCompletion(context *glsp.Context, params *protocol.CompletionPa
return nil, nil
}
if entry.Separator.IsPositionBeforeEnd(cursor) {
return handlers.GetCompletionsForEntry(
cursor,
entry,
d.Indexes,
)
}
return nil, nil
return handlers.GetCompletionsForEntry(
cursor,
entry,
d.Indexes,
)
}

2
server/handlers/aliases/lsp/text-document-definition.go
View File

@ -32,7 +32,7 @@ func TextDocumentDefinition(context *glsp.Context, params *protocol.DefinitionPa
return handlers.GetDefinitionLocationForValue(
*d.Indexes,
*rawValue,
rawValue,
params.TextDocument.URI,
), nil
}

4
server/handlers/aliases/lsp/text-document-hover.go
View File

@ -49,10 +49,10 @@ func TextDocumentHover(
}
contents := []string{}
contents = append(contents, handlers.GetAliasValueTypeInfo(*value)...)
contents = append(contents, handlers.GetAliasValueTypeInfo(value)...)
contents = append(contents, "")
contents = append(contents, "#### Value")
contents = append(contents, handlers.GetAliasValueHoverInfo(*document.Indexes, *value))
contents = append(contents, handlers.GetAliasValueHoverInfo(*document.Indexes, value))
text := strings.Join(contents, "\n")

4
server/handlers/aliases/lsp/text-document-prepare-rename.go
View File

@ -34,9 +34,9 @@ func TextDocumentPrepareRename(context *glsp.Context, params *protocol.PrepareRe
return nil, nil
}
switch (*rawValue).(type) {
switch rawValue.(type) {
case ast.AliasValueUser:
userValue := (*rawValue).(ast.AliasValueUser)
userValue := rawValue.(ast.AliasValueUser)
return userValue.Location.ToLSPRange(), nil
}

4
server/handlers/aliases/lsp/text-document-rename.go
View File

@ -44,9 +44,9 @@ func TextDocumentRename(context *glsp.Context, params *protocol.RenameParams) (*
return nil, nil
}
switch (*rawValue).(type) {
switch rawValue.(type) {
case ast.AliasValueUser:
userValue := (*rawValue).(ast.AliasValueUser)
userValue := rawValue.(ast.AliasValueUser)
changes := handlers.RenameAlias(
*d.Indexes,

10
server/handlers/aliases/lsp/text-document-signature-help.go
View File

@ -14,7 +14,7 @@ func TextDocumentSignatureHelp(context *glsp.Context, params *protocol.Signature
document := aliases.DocumentParserMap[params.TextDocument.URI]
line := params.Position.Line
cursor := common.LSPCharacterAsCursorPosition(common.CursorToCharacterIndex(params.Position.Character))
cursor := common.LSPCharacterAsCursorPosition(params.Position.Character)
if _, found := document.Parser.CommentLines[line]; found {
// Comment
@ -36,17 +36,15 @@ func TextDocumentSignatureHelp(context *glsp.Context, params *protocol.Signature
if entry.Values != nil && entry.Values.Location.ContainsPosition(cursor) {
value := handlers.GetValueAtPosition(cursor, entry)
if value == nil {
if value == nil || value.GetAliasValue().Value == "" {
// For some reason, this does not really work,
// When we return all, and then a user value is entered
// and the `GetValueSignatureHelp` is called, still the old
// signatures with all signature are shown
// return handlers.GetAllValuesSignatureHelp(), nil
return nil, nil
return handlers.GetAllValuesSignatureHelp(), nil
}
return handlers.GetValueSignatureHelp(cursor, *value), nil
return handlers.GetValueSignatureHelp(cursor, value), nil
}
return nil, nil