Merge pull request #4 from hegrec/fix/callbackfs-pnp-panic

Fix panic from yarn-pnp initialization

Author: GGomez99

internal/api/server.go

@@ -85,7 +85,8 @@ func (s *StdioServer) Run(ctx context.Context) error {
 	projectSession := project.NewSession(&project.SessionInit{
 		BackgroundCtx: ctx,
 		Logger:        nil, // TODO: Add logging support
-		FS:            fs,
+		FS:                fs,
+		PnpApi:            pnpApi,
 		Options: &project.SessionOptions{
 			CurrentDirectory:   s.options.Cwd,
 			DefaultLibraryPath: s.options.DefaultLibraryPath,

internal/lsp/server.go

@@ -1140,7 +1140,8 @@ func (s *Server) handleInitialized(ctx context.Context, params *lsproto.Initiali
 			PushDiagnosticsEnabled: !disablePushDiagnostics,
 			Locale:                 s.locale,
 		},
-		FS:          fs,
+		FS:                fs,
+		PnpApi:            pnpApi,
 		Logger:      s.logger,
 		Client:      s,
 		NpmExecutor: s,

internal/project/session.go

@@ -69,6 +69,7 @@ type SessionInit struct {
 	Logger        logging.Logger
 	NpmExecutor   ata.NpmExecutor
 	ParseCache    *ParseCache
+	PnpApi *pnp.PnpApi
 }
 
 // Session manages the state of an LSP session. It receives textDocument
@@ -211,6 +212,7 @@ func NewSession(init *SessionInit) *Session {
 				},
 			),
 			toPath,
+			init.PnpApi,
 		),
 		initialUserPreferences:   lsutil.NewDefaultUserPreferences(),
 		workspaceUserPreferences: lsutil.NewDefaultUserPreferences(),

internal/project/snapshot.go

@@ -63,8 +63,8 @@ func NewSnapshot(
 	autoImports *autoimport.Registry,
 	autoImportsWatch *WatchedFiles[map[tspath.Path]string],
 	toPath func(fileName string) tspath.Path,
+	pnpApi *pnp.PnpApi,
 ) *Snapshot {
-	pnpApi := pnp.InitPnpApi(fs.fs, sessionOptions.CurrentDirectory)
 	if pnpApi != nil {
 		fs.fs = pnpvfs.From(fs.fs)
 	}
@@ -464,6 +464,7 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 		autoImports,
 		autoImportsWatch,
 		s.toPath,
+		s.pnpApi,
 	)
 	newSnapshot.parentId = s.id
 	newSnapshot.ProjectCollection = projectCollection