Skip to content

Commit ec09ad2

Browse files
committed
Refactor memoizedDiskFile type to return FileHandle instead of *diskFile in snapshotFS
1 parent 7d116ce commit ec09ad2

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

internal/project/snapshotfs.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type snapshotFS struct {
3030
readFiles collections.SyncMap[tspath.Path, memoizedDiskFile]
3131
}
3232

33-
type memoizedDiskFile func() *diskFile
33+
type memoizedDiskFile func() FileHandle
3434

3535
func (s *snapshotFS) FS() vfs.FS {
3636
return s.fs
@@ -43,18 +43,14 @@ func (s *snapshotFS) GetFile(fileName string) FileHandle {
4343
if file, ok := s.diskFiles[s.toPath(fileName)]; ok {
4444
return file
4545
}
46-
newEntry := memoizedDiskFile(sync.OnceValue(func() *diskFile {
46+
newEntry := memoizedDiskFile(sync.OnceValue(func() FileHandle {
4747
if contents, ok := s.fs.ReadFile(fileName); ok {
4848
return newDiskFile(fileName, contents)
4949
}
5050
return nil
5151
}))
5252
entry, _ := s.readFiles.LoadOrStore(s.toPath(fileName), newEntry)
53-
file := entry()
54-
if file == nil {
55-
return nil
56-
}
57-
return file
53+
return entry()
5854
}
5955

6056
type snapshotFSBuilder struct {

0 commit comments

Comments
 (0)