Fix nested paths in flow cadence lint

Author: jribbink

internal/cadence/lint_test.go

@@ -308,6 +308,28 @@ func Test_Lint(t *testing.T) {
 			results,
 		)
 	})
+
+	t.Run("resolves nested imports when contract imported by name", func(t *testing.T) {
+		t.Parallel()
+
+		state := setupMockState(t)
+
+		results, err := lintFiles(state, "TransactionImportingContractWithNestedImports.cdc")
+		require.NoError(t, err)
+
+		require.Equal(t,
+			&lintResult{
+				Results: []fileResult{
+					{
+						FilePath:    "TransactionImportingContractWithNestedImports.cdc",
+						Diagnostics: []analysis.Diagnostic{},
+					},
+				},
+				exitCode: 0,
+			},
+			results,
+		)
+	})
 }
 
 func setupMockState(t *testing.T) *flowkit.State {
@@ -380,6 +402,43 @@ func setupMockState(t *testing.T) *flowkit.State {
 		log(RLP.getType())
 	}`), 0644)
 
+	// Regression test files for nested import bug
+	_ = afero.WriteFile(mockFs, "Helper.cdc", []byte(`
+	access(all) contract Helper {
+		access(all) let name: String
+		
+		init() {
+			self.name = "Helper"
+		}
+		
+		access(all) fun greet(): String {
+			return "Hello from ".concat(self.name)
+		}
+	}
+	`), 0644)
+
+	_ = afero.WriteFile(mockFs, "ContractWithNestedImports.cdc", []byte(`
+	import Helper from "./Helper.cdc"
+	
+	access(all) contract ContractWithNestedImports {
+		access(all) fun test(): String {
+			return Helper.greet()
+		}
+		init() {}
+	}
+	`), 0644)
+
+	_ = afero.WriteFile(mockFs, "TransactionImportingContractWithNestedImports.cdc", []byte(`
+	import ContractWithNestedImports from "ContractWithNestedImports"
+	
+	transaction() {
+		prepare(signer: auth(Storage) &Account) {
+			log(ContractWithNestedImports.test())
+		}
+	}
+	`), 0644)
+
+
 	rw := afero.Afero{Fs: mockFs}
 	state, err := flowkit.Init(rw)
 	require.NoError(t, err)
@@ -389,6 +448,14 @@ func setupMockState(t *testing.T) *flowkit.State {
 		Name:     "NoError",
 		Location: "NoError.cdc",
 	})
+	state.Contracts().AddOrUpdate(config.Contract{
+		Name:     "Helper",
+		Location: "Helper.cdc",
+	})
+	state.Contracts().AddOrUpdate(config.Contract{
+		Name:     "ContractWithNestedImports",
+		Location: "ContractWithNestedImports.cdc",
+	})
 
 	return state
 }

internal/cadence/linter.go

@@ -196,11 +196,21 @@ func (l *linter) handleImport(
 			Elaboration: helpersChecker.Elaboration,
 		}, nil
 	default:
+		// Normalize path-based imports relative to the current checker location
+		// This ensures relative imports are resolved correctly
+		if l.isPathLocation(importedLocation) {
+			importedLocation = l.normalizePathLocation(checker.Location, importedLocation)
+		}
+
 		filepath, err := l.resolveImportFilepath(importedLocation, checker.Location)
 		if err != nil {
 			return nil, err
 		}
 
+		// Use the filepath as the location for caching and SubChecker
+		// This ensures nested imports are resolved relative to the actual file location
+		fileLocation := common.StringLocation(filepath)
+
 		importedChecker, ok := l.checkers[filepath]
 		if !ok {
 			code, err := l.state.ReadFile(filepath)
@@ -219,7 +229,9 @@ func (l *linter) handleImport(
 				}
 			}
 
-			importedChecker, err = checker.SubChecker(importedProgram, importedLocation)
+			// Use the file location for the subchecker
+			// This ensures nested imports within the imported file are resolved correctly
+			importedChecker, err = checker.SubChecker(importedProgram, fileLocation)
 			if err != nil {
 				return nil, err
 			}
@@ -237,6 +249,38 @@ func (l *linter) handleImport(
 	}
 }
 
+// isPathLocation returns true if the location is a file path (contains .cdc)
+func (l *linter) isPathLocation(location common.Location) bool {
+	stringLocation, ok := location.(common.StringLocation)
+	if !ok {
+		return false
+	}
+	return strings.Contains(stringLocation.String(), ".cdc")
+}
+
+// normalizePathLocation normalizes a relative path import against a base location
+// This matches the behavior of the language server
+func (l *linter) normalizePathLocation(base, relative common.Location) common.Location {
+	baseString, baseOk := base.(common.StringLocation)
+	relativeString, relativeOk := relative.(common.StringLocation)
+
+	if !baseOk || !relativeOk {
+		return relative
+	}
+
+	basePath := baseString.String()
+	relativePath := relativeString.String()
+
+	// If the relative path is absolute, return it as-is
+	if filepath.IsAbs(relativePath) {
+		return relative
+	}
+
+	// Join relative to the parent directory of the base
+	normalizedPath := filepath.Join(filepath.Dir(basePath), relativePath)
+	return common.StringLocation(normalizedPath)
+}
+
 func (l *linter) resolveImportFilepath(
 	location common.Location,
 	parentLocation common.Location,
@@ -246,7 +290,7 @@ func (l *linter) resolveImportFilepath(
 ) {
 	switch location := location.(type) {
 	case common.StringLocation:
-		// If the location is not a cadence file try getting the code by identifier
+		// If the location is not a cadence file, try getting the code by identifier
 		if !strings.Contains(location.String(), ".cdc") {
 			contract, err := l.state.Contracts().ByName(location.String())
 			if err != nil {
@@ -256,14 +300,9 @@ func (l *linter) resolveImportFilepath(
 			return contract.Location, nil
 		}
 
-		// If the location is a cadence file, resolve relative to the parent location
-		parentPath := ""
-		if parentLocation != nil {
-			parentPath = parentLocation.String()
-		}
-
-		resolvedPath := filepath.Join(filepath.Dir(parentPath), location.String())
-		return resolvedPath, nil
+		// If the location is a cadence file, it should already be normalized
+		// by this point, so just return it
+		return location.String(), nil
 	default:
 		return "", fmt.Errorf("unsupported location: %T", location)
 	}