fix detection of single file during initialization (#172)

hashicorp · Jun 19, 2020 · ae57dbd · ae57dbd
1 parent e5227ca
commit ae57dbd
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/langserver/handlers/initialize.go b/langserver/handlers/initialize.go
@@ -26,14 +26,13 @@ func (lh *logHandler) Initialize(ctx context.Context, params lsp.InitializeParam
 	}
 
 	fh := ilsp.FileHandlerFromDirURI(params.RootURI)
-	if !fh.Valid() {
-		return serverCaps, fmt.Errorf("URI %q is not valid", params.RootURI)
-	}
-
-	if !fh.IsDir() {
+	if fh.URI() == "" || !fh.IsDir() {
 		return serverCaps, fmt.Errorf("Editing a single file is not yet supported." +
 			" Please open a directory.")
 	}
+	if !fh.Valid() {
+		return serverCaps, fmt.Errorf("URI %q is not valid", params.RootURI)
+	}
 
 	err := lsctx.SetClientCapabilities(ctx, &params.Capabilities)
 	if err != nil {