Remove wrapped fs stuff

Author: sheetalkamat

internal/bundled/embed.go

@@ -31,24 +31,12 @@ type wrappedFS struct {
 	fs vfs.FS
 }
 
-type WrappedFS interface {
-	vfs.FS
-	InternalFS() vfs.FS
-}
-
-var (
-	_ vfs.FS    = (*wrappedFS)(nil)
-	_ WrappedFS = (*wrappedFS)(nil)
-)
+var _ vfs.FS = (*wrappedFS)(nil)
 
 func wrapFS(fs vfs.FS) vfs.FS {
 	return &wrappedFS{fs: fs}
 }
 
-func (vfs *wrappedFS) InternalFS() vfs.FS {
-	return vfs.fs
-}
-
 func (vfs *wrappedFS) UseCaseSensitiveFileNames() bool {
 	return vfs.fs.UseCaseSensitiveFileNames()
 }

internal/lsp/lspservertests/testserver.go

@@ -37,20 +37,19 @@ type testServer struct {
 
 func newTestServer(t *testing.T, files map[string]any) *testServer {
 	t.Helper()
-	server, utils := lsptestutil.Setup(t, files)
+	server, utils, fsFromMap := lsptestutil.Setup(t, files)
 	testServer := &testServer{
 		t:         t,
 		files:     files,
 		server:    server,
 		utils:     utils,
 		openFiles: make(map[string]string),
 	}
-	wrappedFs := testServer.server.FS.(bundled.WrappedFS)
 	testServer.fsDiffer = &fsbaselineutil.FSDiffer{
-		FS:           wrappedFs.InternalFS().(iovfs.FsWithSys),
+		FS:           fsFromMap.(iovfs.FsWithSys),
 		WrittenFiles: &testServer.writtenFiles,
 	}
-	fmt.Fprintf(&testServer.baseline, "UseCaseSensitiveFileNames: %v\n", wrappedFs.UseCaseSensitiveFileNames())
+	fmt.Fprintf(&testServer.baseline, "UseCaseSensitiveFileNames: %v\n", fsFromMap.UseCaseSensitiveFileNames())
 	testServer.fsDiffer.BaselineFSwithDiff(&testServer.baseline)
 	return testServer
 }

internal/testutil/lsptestutil/lsptestutil.go

@@ -286,8 +286,8 @@ func ptrTo[T any](v T) *T {
 	return &v
 }
 
-func Setup(t *testing.T, files map[string]any) (*TestLspServer, *projecttestutil.SessionUtils) {
-	initOptions, sessionUtils := projecttestutil.GetSessionInitOptions(files, nil, &projecttestutil.TypingsInstallerOptions{})
+func Setup(t *testing.T, files map[string]any) (*TestLspServer, *projecttestutil.SessionUtils, vfs.FS) {
+	initOptions, sessionUtils, fsFromMap := projecttestutil.GetSessionInitOptions(files, nil, &projecttestutil.TypingsInstallerOptions{})
 	initOptions.Options.TypingsLocation = "" // Disable ata
 	watchEnabledCapabilities := &lsproto.ClientCapabilities{
 		Workspace: &lsproto.WorkspaceClientCapabilities{
@@ -305,5 +305,5 @@ func Setup(t *testing.T, files map[string]any) (*TestLspServer, *projecttestutil
 		TypingsLocation: initOptions.Options.TypingsLocation,
 		Capabilities:    watchEnabledCapabilities,
 	})
-	return server, sessionUtils
+	return server, sessionUtils, fsFromMap
 }

internal/testutil/projecttestutil/projecttestutil.go

@@ -192,7 +192,7 @@ func SetupWithTypingsInstaller(files map[string]any, tiOptions *TypingsInstaller
 }
 
 func SetupWithOptionsAndTypingsInstaller(files map[string]any, options *project.SessionOptions, tiOptions *TypingsInstallerOptions) (*project.Session, *SessionUtils) {
-	init, sessionUtils := GetSessionInitOptions(files, options, tiOptions)
+	init, sessionUtils, _ := GetSessionInitOptions(files, options, tiOptions)
 	session := project.NewSession(init)
 
 	return session, sessionUtils
@@ -202,8 +202,9 @@ func WithRequestID(ctx context.Context) context.Context {
 	return core.WithRequestID(ctx, "0")
 }
 
-func GetSessionInitOptions(files map[string]any, options *project.SessionOptions, tiOptions *TypingsInstallerOptions) (*project.SessionInit, *SessionUtils) {
-	fs := bundled.WrapFS(vfstest.FromMap(files, false /*useCaseSensitiveFileNames*/))
+func GetSessionInitOptions(files map[string]any, options *project.SessionOptions, tiOptions *TypingsInstallerOptions) (*project.SessionInit, *SessionUtils, vfs.FS) {
+	fsFromMap := vfstest.FromMap(files, false /*useCaseSensitiveFileNames*/)
+	fs := bundled.WrapFS(fsFromMap)
 	clientMock := &ClientMock{}
 	npmExecutorMock := &NpmExecutorMock{}
 	sessionUtils := &SessionUtils{
@@ -235,5 +236,5 @@ func GetSessionInitOptions(files map[string]any, options *project.SessionOptions
 		Client:      clientMock,
 		NpmExecutor: npmExecutorMock,
 		Logger:      sessionUtils.logger,
-	}, sessionUtils
+	}, sessionUtils, fsFromMap
 }