refactor

Author: gabritto

internal/ls/definition.go

@@ -57,28 +57,6 @@ func (l *LanguageService) ProvideDefinition(ctx context.Context, documentURI lsp
 	return l.createLocationsFromDeclarations(declarations), nil
 }
 
-// func (l *LanguageService) getMappedDefinition(definitions lsproto.DefinitionResponse) lsproto.DefinitionResponse {
-// 	if definitions.Location != nil {
-// 		definitions.Location = l.getMappedLocation(definitions.Location)
-// 	}
-// 	if definitions.Locations != nil {
-// 		for i, loc := range *definitions.Locations {
-// 			(*definitions.Locations)[i] = *l.getMappedLocation(&loc)
-// 		}
-// 	}
-// 	if definitions.DefinitionLinks != nil {
-// 		for i, link := range *definitions.DefinitionLinks {
-// 			mappedTarget := l.getMappedLocation(&lsproto.Location{Uri: link.TargetUri, Range: link.TargetRange})
-// 			mappedSelection := l.getMappedLocation(&lsproto.Location{Uri: link.TargetUri, Range: link.TargetSelectionRange})
-// 			debug.Assert(mappedTarget.Uri == mappedSelection.Uri, "target and selection should be in same file")
-// 			(*definitions.DefinitionLinks)[i].TargetUri = mappedTarget.Uri
-// 			(*definitions.DefinitionLinks)[i].TargetRange = mappedTarget.Range
-// 			(*definitions.DefinitionLinks)[i].TargetSelectionRange = mappedSelection.Range
-// 		}
-// 	}
-// 	return definitions
-// }
-
 func (l *LanguageService) ProvideTypeDefinition(ctx context.Context, documentURI lsproto.DocumentUri, position lsproto.Position) (lsproto.DefinitionResponse, error) {
 	program, file := l.getProgramAndFile(documentURI)
 	node := astnav.GetTouchingPropertyName(file, int(l.converters.LineAndCharacterToPosition(file, position)))

internal/project/snapshotfs.go

@@ -27,13 +27,10 @@ type snapshotFS struct {
 	fs        vfs.FS
 	overlays  map[tspath.Path]*overlay
 	diskFiles map[tspath.Path]*diskFile
-	readFiles collections.SyncMap[tspath.Path, memoizedFileEntry]
+	readFiles collections.SyncMap[tspath.Path, memoizedDiskFile]
 }
 
-// !!! newtype?
-type memoizedFileEntry struct {
-	read func() *diskFile
-}
+type memoizedDiskFile func() *diskFile
 
 func (s *snapshotFS) FS() vfs.FS {
 	return s.fs
@@ -46,16 +43,14 @@ func (s *snapshotFS) GetFile(fileName string) FileHandle {
 	if file, ok := s.diskFiles[s.toPath(fileName)]; ok {
 		return file
 	}
-	newEntry := memoizedFileEntry{
-		read: sync.OnceValue(func() *diskFile {
-			if contents, ok := s.fs.ReadFile(fileName); ok {
-				return newDiskFile(fileName, contents)
-			}
-			return nil
-		}),
-	}
+	newEntry := memoizedDiskFile(sync.OnceValue(func() *diskFile {
+		if contents, ok := s.fs.ReadFile(fileName); ok {
+			return newDiskFile(fileName, contents)
+		}
+		return nil
+	}))
 	if entry, ok := s.readFiles.LoadOrStore(s.toPath(fileName), newEntry); ok {
-		return entry.read()
+		return entry()
 	}
 	return nil
 }