Merge pull request #444 from onflow/jribbink/crypto-fix

[LS] Add Crypto identifier import back

languageserver/cmd/languageserver/main_wasm.go

@@ -29,8 +29,11 @@ import (
 	"syscall/js"
 
 	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/stdlib"
 
 	"github.com/onflow/cadence-tools/languageserver/server"
+
+	coreContracts "github.com/onflow/flow-core-contracts/lib/go/contracts"
 )
 
 const globalFunctionNamePrefix = "CADENCE_LANGUAGE_SERVER"
@@ -185,6 +188,13 @@ func start(id int) {
 		return res.String(), nil
 	}
 
+	identifierImportResolver := func(location common.IdentifierLocation) (code string, err error) {
+		if location == stdlib.CryptoContractLocation {
+			return string(coreContracts.Crypto()), nil
+		}
+		return "", fmt.Errorf("CLS %d: unknown identifier location: %s", id, location)
+	}
+
 	languageServer, err := server.NewServer()
 	if err != nil {
 		panic(err)
@@ -193,6 +203,7 @@ func start(id int) {
 	err = languageServer.SetOptions(
 		server.WithAddressImportResolver(addressImportResolver),
 		server.WithStringImportResolver(stringImportResolver),
+		server.WithIdentifierImportResolver(identifierImportResolver),
 	)
 	if err != nil {
 		panic(err)

languageserver/go.mod

@@ -23,7 +23,7 @@ require (
 )
 
 require (
-	github.com/onflow/flow-core-contracts/lib/go/contracts v1.4.0 // indirect
+	github.com/onflow/flow-core-contracts/lib/go/contracts v1.4.0
 	github.com/onflow/flow-core-contracts/lib/go/templates v1.4.0 // indirect
 )
 

languageserver/integration/integration.go

@@ -53,6 +53,7 @@ func NewFlowIntegration(s *server.Server, enableFlowClient bool) (*FlowIntegrati
 		server.WithStringImportResolver(resolve.stringImport),
 		server.WithInitializationOptionsHandler(integration.initialize),
 		server.WithExtendedStandardLibraryValues(FVMStandardLibraryValues()...),
+		server.WithIdentifierImportResolver(resolve.identifierImport),
 	}
 
 	if enableFlowClient {

languageserver/integration/resolvers.go

@@ -20,14 +20,18 @@ package integration
 
 import (
 	"errors"
+	"fmt"
 	"path/filepath"
 	"strings"
 
 	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/sema"
+	"github.com/onflow/cadence/stdlib"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flowkit/v2"
 	"github.com/onflow/flowkit/v2/config"
+
+	coreContracts "github.com/onflow/flow-core-contracts/lib/go/contracts"
 )
 
 type resolvers struct {
@@ -66,6 +70,14 @@ func (r *resolvers) addressImport(location common.AddressLocation) (string, erro
 	return string(account.Contracts[location.Name]), nil
 }
 
+// identifierImport resolves the code for an identifier location.
+func (r *resolvers) identifierImport(location common.IdentifierLocation) (string, error) {
+	if location == stdlib.CryptoContractLocation {
+		return string(coreContracts.Crypto()), nil
+	}
+	return "", fmt.Errorf("unknown identifier location: %s", location)
+}
+
 // addressContractNames returns a slice of all the contract names on the address location.
 func (r *resolvers) addressContractNames(address common.Address) ([]string, error) {
 	if r.client == nil {

languageserver/server/server.go

@@ -175,6 +175,8 @@ type Server struct {
 	resolveAddressContractNames AddressContractNamesResolver
 	// resolveStringImport is the optional function that is used to resolve string imports
 	resolveStringImport StringImportResolver
+	// resolveIdentifierImport is the optional function that is used to resolve identifier imports
+	resolveIdentifierImport func(location common.IdentifierLocation) (string, error)
 	// codeLensProviders are the functions that are used to provide code lenses for a checker
 	codeLensProviders []CodeLensProvider
 	// diagnosticProviders are the functions that are used to provide diagnostics for a checker
@@ -242,6 +244,15 @@ func WithStringImportResolver(resolver StringImportResolver) Option {
 	}
 }
 
+// WithIdentifierImportResolver returns a server option that sets the given function
+// as the function that is used to resolve identifier imports
+func WithIdentifierImportResolver(resolver func(location common.IdentifierLocation) (string, error)) Option {
+	return func(s *Server) error {
+		s.resolveIdentifierImport = resolver
+		return nil
+	}
+}
+
 // WithCodeLensProvider returns a server option that adds the given function
 // as a function that is used to generate code lenses
 func WithCodeLensProvider(provider CodeLensProvider) Option {
@@ -2048,6 +2059,12 @@ func (s *Server) resolveImport(location common.Location) (program *ast.Program,
 		}
 		code, err = s.resolveAddressImport(loc)
 
+	case common.IdentifierLocation:
+		if s.resolveIdentifierImport == nil {
+			return nil, nil
+		}
+		code, err = s.resolveIdentifierImport(loc)
+
 	default:
 		return nil, nil
 	}