Merge pull request #20 from Myzel394/add-ssh-import

Improve SSH

README.md

@@ -2,15 +2,17 @@
 
 |             | diagnostics | `completion` | `hover` | `code-action` | `definition` | `rename` | `signature-help` |
 |-------------|-------------|--------------|---------|---------------|--------------|----------|------------------|
-| aliases     | ✅           | ✅            | ✅       | ✅             | ✅            | ✅        | ✅                |
-| fstab       | ✅           | ✅            | ✅       | ❓             | ❓            | ❓        | 🟡                |
-| hosts       | ✅           | ✅            | ✅       | ✅             | ❓            | ❓        | 🟡                |
-| sshd_config | ✅           | ✅            | ✅       | ❓             | ✅            | ❓        | 🟡                |
-| wireguard   | ✅           | ✅            | ✅       | ✅             | ❓            | ❓        | 🟡                |
+| aliases     | ✅           | ✅            | ✅       | ✅             | ✅            | ✅        | ✅               |
+| fstab       | ✅           | ✅            | ✅       | ❓             | ❓            | ❓        | 🟡               |
+| hosts       | ✅           | ✅            | ✅       | ✅             | ❓            | ❓        | 🟡               |
+| ssh_config  | ✅           | ✅            | ✅       | ✅             | ✅            | ❓        | ✅               |
+| sshd_config | ✅           | ✅            | ✅       | ❓             | ✅            | ❓        | ✅               |
+| wireguard   | ✅           | ✅            | ✅       | ✅             | ❓            | ❓        | 🟡               |
 
 ✅ = Supported
 
 🟡 = Will be supported, but not yet implemented
 
 ❓ = No idea what to implement here, please let me know if you have any ideas
 
+

server/doc-values/value-array.go

@@ -3,6 +3,7 @@ package docvalues
 import (
 	"config-lsp/utils"
 	"fmt"
+	"regexp"
 	"strings"
 
 	protocol "github.com/tliron/glsp/protocol_3_16"
@@ -42,6 +43,9 @@ type ArrayValue struct {
 	// This is used to extract the value from the user input,
 	// because you may want to preprocess the value before checking for duplicates
 	DuplicatesExtractor *(func(string) string)
+
+	// If true, array ArrayValue ignores the `Separator` if it's within quotes
+	RespectQuotes bool
 }
 
 func (v ArrayValue) GetTypeDescription() []string {
@@ -53,9 +57,18 @@ func (v ArrayValue) GetTypeDescription() []string {
 	)
 }
 
+// TODO: Add support for quotes
 func (v ArrayValue) DeprecatedCheckIsValid(value string) []*InvalidValue {
 	errors := []*InvalidValue{}
-	values := strings.Split(value, v.Separator)
+	var values []string
+
+	if v.RespectQuotes {
+		splitPattern := *regexp.MustCompile(fmt.Sprintf(`".+?"|[^%s]+`, v.Separator))
+
+		values = splitPattern.FindAllString(value, -1)
+	} else {
+		values = strings.Split(value, v.Separator)
+	}
 
 	if *v.DuplicatesExtractor != nil {
 		valuesOccurrences := utils.SliceToMap(
@@ -122,9 +135,27 @@ func (v ArrayValue) getCurrentValue(line string, cursor uint32) (string, uint32)
 	MIN := uint32(0)
 	MAX := uint32(len(line) - 1)
 
+	var cursorSearchStart = cursor
+	var cursorSearchEnd = cursor
+
 	var start uint32
 	var end uint32
 
+	// Hello,world,how,are,you
+	// Hello,"world,how",are,you
+	if v.RespectQuotes {
+		quotes := utils.GetQuoteRanges(line)
+
+		if len(quotes) > 0 {
+			quote := quotes.GetQuoteForIndex(int(cursor))
+
+			if quote != nil {
+				cursorSearchStart = uint32(quote[0])
+				cursorSearchEnd = uint32(quote[1])
+			}
+		}
+	}
+
 	// hello,w[o]rld,and,more
 	// [h]ello,world
 	// hello,[w]orld
@@ -135,7 +166,7 @@ func (v ArrayValue) getCurrentValue(line string, cursor uint32) (string, uint32)
 	relativePosition, found := utils.FindPreviousCharacter(
 		line,
 		v.Separator,
-		int(cursor),
+		int(cursorSearchStart),
 	)
 
 	if found {
@@ -151,7 +182,7 @@ func (v ArrayValue) getCurrentValue(line string, cursor uint32) (string, uint32)
 	relativePosition, found = utils.FindNextCharacter(
 		line,
 		v.Separator,
-		int(start),
+		int(cursorSearchEnd),
 	)
 
 	if found {

server/handlers/aliases/handlers/completions.go

@@ -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) &&

server/handlers/aliases/handlers/get-value.go

@@ -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]
 }

server/handlers/aliases/handlers/signature_help.go

@@ -28,8 +28,8 @@ func GetRootSignatureHelp(
 					},
 					{
 						Label: []uint32{
-							uint32(len("<alias>:")),
-							uint32(len("<alias>:") + len("<value1>")),
+							uint32(len("<alias>: ")),
+							uint32(len("<alias>: ") + len("<value1>")),
 						},
 						Documentation: "A value to associate with the alias",
 					},

server/handlers/aliases/lsp/text-document-completion.go

@@ -28,25 +28,17 @@ 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
 	}
 
 	if entry.Separator == nil && entry.Key.Location.IsPositionBeforeEnd(cursor) {
 		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,
+	)
 }

server/handlers/aliases/lsp/text-document-definition.go

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

server/handlers/aliases/lsp/text-document-hover.go

@@ -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")
 

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

@@ -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
 		}

server/handlers/aliases/lsp/text-document-rename.go

@@ -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,

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

@@ -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

server/handlers/ssh_config/analyzer/analyzer.go

@@ -35,7 +35,27 @@ func Analyze(
 
 	d.Indexes = i
 
+	analyzeIncludeValues(ctx)
+
+	if len(ctx.diagnostics) == 0 {
+		for _, include := range d.Indexes.Includes {
+			for _, value := range include.Values {
+				for _, path := range value.Paths {
+					_, err := parseFile(string(path))
+
+					if err != nil {
+						ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
+							Range:   value.LocationRange.ToLSPRange(),
+							Message: err.Error(),
+						})
+					}
+				}
+			}
+		}
+	}
+
 	analyzeValuesAreValid(ctx)
+	analyzeTokens(ctx)
 	analyzeIgnoreUnknownHasNoUnnecessary(ctx)
 	analyzeDependents(ctx)
 	analyzeBlocks(ctx)