feat(lsp): import members

vknabel · Nov 11, 2022 · ee7f98d · ee7f98d
1 parent 00b568c
commit ee7f98d
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/examples/greeter/cmd/test.lithia b/examples/greeter/cmd/test.lithia
@@ -1,7 +1,6 @@
 module example
 
 import tests
-import results
 
 tests.test "example", { fail =>
     unless True, fail "should never happen"

diff --git a/langsrv/handler-completion.go b/langsrv/handler-completion.go
@@ -17,6 +17,12 @@ func textDocumentCompletion(context *glsp.Context, params *protocol.CompletionPa
 	if err != nil {
 		return nil, err
 	}
+	switch targetNode.Type() {
+	case "{", "}":
+		if targetNode.Parent() != nil {
+			targetNode = targetNode.Parent()
+		}
+	}
 
 	insertAsStatement := false
 	contextReferenceType := targetNode.Type()
@@ -37,6 +43,42 @@ func textDocumentCompletion(context *glsp.Context, params *protocol.CompletionPa
 	completionItems := []protocol.CompletionItem{}
 
 	switch targetNode.Type() {
+	case "import_members":
+		globalDeclarations := rc.sourceFile.Declarations
+		for _, decl := range globalDeclarations {
+			decl, ok := decl.(ast.DeclImport)
+			if !ok || !includesAstSourcePosition(decl.Meta().Source, rc.position) {
+				continue
+			}
+			exportedDecls, err := rc.moduleDeclarationsForImportDecl(decl)
+			if err != nil {
+				return nil, err
+			}
+			for _, exportedDecl := range exportedDecls {
+				skip := false
+				for _, alreadyImported := range decl.Members {
+					if alreadyImported.Name == exportedDecl.DeclName() {
+						skip = true
+						break
+					}
+				}
+				if skip {
+					continue
+				}
+				detail := "import member"
+				insertText := fmt.Sprintf("%s,\n", exportedDecl.DeclName())
+				completionItem := protocol.CompletionItem{
+					Label:            string(exportedDecl.DeclName()),
+					Kind:             completionItemKindForDecl(exportedDecl),
+					Documentation:    documentationMarkupContentForDecl(exportedDecl),
+					Detail:           &detail,
+					InsertText:       &insertText,
+					CommitCharacters: []string{" "},
+				}
+				completionItems = append(completionItems, completionItem)
+			}
+		}
+		return completionItems, nil
 	case parser.TYPE_NODE_IMPORT_DECLARATION, "import":
 		kind := protocol.CompletionItemKindModule
 		mods, err := ls.resolver.ImportableModules(rc.module.Package())
@@ -233,7 +275,6 @@ func (rc *ReqContext) textDocumentMemberAccessCompletionItems(context *glsp.Cont
 			if string(decl.DeclName()) != accessedExpr {
 				continue
 			}
-			// TODO: support imported module
 			moduleDecls, err := rc.moduleDeclarationsForImportDecl(decl)
 			if err != nil {
 				return nil, err