Don't suggest if or contains following import (#834)

Also:
- improve handling of manually invoked suggestions
- don't suggest "import" after "import "

Fixes #830

Signed-off-by: Anders Eknert <[email protected]>

.golangci.yaml

@@ -11,6 +11,7 @@ linters:
     - varnamelen
     - nonamedreturns
     - testpackage
+    - goconst
     - gochecknoinits
     - gomnd
     - mnd

internal/lsp/completions/providers/import.go

@@ -17,12 +17,15 @@ func (*Import) Run(c *cache.Cache, params types.CompletionParams, _ *Options) ([
 
 	_, currentLine := completionLineHelper(c, fileURI, params.Position.Line)
 
-	if params.Context.TriggerKind == completion.Invoked && params.Position.Character == 0 {
+	// the user manually invoked completions at the beginning of an empty line
+	if params.Position.Character == 0 && strings.TrimSpace(currentLine) == "" {
 		return importCompletionItem(params), nil
 	}
 
 	// the user must type i before we provide completions
-	if params.Position.Line != 0 && strings.HasPrefix(currentLine, "i") {
+	if params.Position.Character != 0 &&
+		strings.HasPrefix(currentLine, "i") &&
+		!strings.HasPrefix(currentLine, "import ") {
 		return importCompletionItem(params), nil
 	}
 

internal/lsp/completions/providers/packagerefs.go

@@ -47,9 +47,12 @@ func (*PackageRefs) Run(c *cache.Cache, params types.CompletionParams, _ *Option
 				continue
 			}
 
-			// only suggest packages that match the last word
-			// the user has typed.
-			if !strings.HasPrefix(ref.Label, lastWord) {
+			// if the user has not typed in any word, they've triggered
+			// completion suggestions manually
+			if strings.TrimSpace(lastWord) != "" &&
+				// otherwise, only suggest packages that match the last
+				// word the user has typed.
+				!strings.HasPrefix(ref.Label, lastWord) {
 				continue
 			}
 

internal/lsp/completions/providers/ruleheadkeyword.go

@@ -31,6 +31,11 @@ func (*RuleHeadKeyword) Run(c *cache.Cache, params types.CompletionParams, _ *Op
 		return []types.CompletionItem{}, nil
 	}
 
+	firstWord := strings.TrimSpace(words[0])
+	if firstWord == "package" || firstWord == "import" {
+		return []types.CompletionItem{}, nil
+	}
+
 	lastWord := words[len(words)-1]
 
 	const keyWdContains = "contains"