Implement basic root module response

hashicorp · Oct 14, 2020 · 39c955f · 39c955f
1 parent 04feec1
commit 39c955f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/langserver/handlers/execute_command.go b/langserver/handlers/execute_command.go
@@ -11,8 +11,23 @@ import (
 
 type executeCommandHandler func(context.Context, lsp.ExecuteCommandParams) (interface{}, error)
 
+type rootmoduleCommandResponse struct {
+	Rootmodule  string `json:"rootmodule"`
+	Initialized bool   `json:"initialized"`
+}
+
 var executeCommandHandlers = map[string]executeCommandHandler{
 	"rootmodule": func(ctx context.Context, params lsp.ExecuteCommandParams) (interface{}, error) {
+		walker, err := lsctx.RootModuleWalker(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		if err := Waiter(func() (bool, error) {
+			return !walker.IsWalking(), nil
+		}).Waitf("root module walker is still walking"); err != nil {
+			return nil, err
+		}
 
 		uri := lsp.DocumentURI(params.Arguments[0].(string))
 		fh := ilsp.FileHandlerFromDocumentURI(uri)
@@ -22,21 +37,17 @@ var executeCommandHandlers = map[string]executeCommandHandler{
 			return nil, err
 		}
 
-		walker, err := lsctx.RootModuleWalker(ctx)
-		if err != nil {
-			return nil, err
+		candidates := cf.RootModuleCandidatesByPath(fh.Dir())
+		if len(candidates) > 1 {
+			return nil, fmt.Errorf("%q appears to have multiple candidate root modules", uri)
 		}
 
-		if err := Waiter(func() (bool, error) {
-			return !walker.IsWalking(), nil
-		}).Waitf("walker is still walking"); err != nil {
-			return nil, err
+		var resp rootmoduleCommandResponse
+		if len(candidates) == 1 {
+			resp.Initialized = true
+			resp.Rootmodule = candidates[0].Path()
 		}
-
-		rootDir, _ := lsctx.RootDirectory(ctx)
-		readableDir := humanReadablePath(rootDir, f.Dir())
-		candidates := cf.RootModuleCandidatesByPath(f.Dir())
-		return nil, nil
+		return resp, nil
 	},
 }
 

diff --git a/langserver/handlers/handlers_test.go b/langserver/handlers/handlers_test.go
@@ -29,7 +29,7 @@ const intializeResponse = `{
 			"documentSymbolProvider":true,
 			"documentFormattingProvider":true,
 			"executeCommandProvider": {
-				"commands": ["workspaces"]
+				"commands": ["rootmodule"]
 			}
 		}
 	}

diff --git a/langserver/handlers/service.go b/langserver/handlers/service.go
@@ -240,7 +240,6 @@ func (svc *service) Assigner() (jrpc2.Assigner, error) {
 				return nil, err
 			}
 
-			ctx = lsctx.WithDocumentStorage(ctx, fs)
 			ctx = lsctx.WithRootDirectory(ctx, &rootDir)
 			ctx = lsctx.WithRootModuleCandidateFinder(ctx, svc.modMgr)
 			ctx = lsctx.WithRootModuleWalker(ctx, svc.walker)