Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/vscode-typescript/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,14 @@ export class Client implements vscode.Disposable {

this.documentSelector = [
...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
...jsTsLanguageModes.map(language => ({
scheme: "untitled",
language,
})),
...jsTsLanguageModes.map(language => ({
scheme: "zip",
language,
})),
];
this.clientOptions = {
documentSelector: this.documentSelector,
Expand Down
17 changes: 16 additions & 1 deletion tsc/cmd/tsc/sys.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import (

"github.com/microsoft/TypeScript/tsc/internal/bundled"
"github.com/microsoft/TypeScript/tsc/internal/execute/tsc"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/tspath"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
"golang.org/x/term"
)

Expand All @@ -22,6 +24,7 @@ type osSys struct {
defaultLibraryPath string
cwd string
start time.Time
pnpApi *pnp.PnpApi
}

func (s *osSys) SinceStart() time.Duration {
Expand Down Expand Up @@ -65,6 +68,10 @@ func (s *osSys) GetEnvironmentVariable(name string) (string, bool) {
return os.LookupEnv(name)
}

func (s *osSys) PnpApi() *pnp.PnpApi {
return s.pnpApi
}

func (s *osSys) Spawn(command []string, dir string, stderr io.Writer) (io.ReadWriteCloser, error) {
return spawnProcess(command, dir, stderr)
}
Expand Down Expand Up @@ -128,11 +135,19 @@ func newSystem() *osSys {
os.Exit(int(tsc.ExitStatusInvalidProject_OutputsSkipped))
}

var fs vfs.FS = osvfs.FS()

pnpApi := pnp.InitPnpApi(fs, tspath.NormalizePath(cwd))
if pnpApi != nil {
fs = pnpvfs.From(fs)
}

return &osSys{
cwd: tspath.NormalizePath(cwd),
fs: bundled.WrapFS(osvfs.FS()),
fs: bundled.WrapFS(fs),
defaultLibraryPath: bundled.LibPath(),
writer: os.Stdout,
start: time.Now(),
pnpApi: pnpApi,
}
}
13 changes: 12 additions & 1 deletion tsc/internal/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/contentmapper"
"github.com/microsoft/TypeScript/tsc/internal/ipc"
"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/project"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/osvfs"
"github.com/microsoft/TypeScript/tsc/internal/vfs/pnpvfs"
)

// StdioServerOptions configures the STDIO-based API server.
Expand Down Expand Up @@ -76,7 +79,14 @@ func (s *StdioServer) Run(ctx context.Context) error {
transport = t
}

fs := bundled.WrapFS(osvfs.FS())
var fs vfs.FS = osvfs.FS()

pnpApi := pnp.InitPnpApi(fs, s.options.Cwd)
if pnpApi != nil {
fs = pnpvfs.From(fs)
}

fs = bundled.WrapFS(fs)

// Wrap the base FS when callbacks or an explicit case-sensitivity setting are requested.
var callbackFS *callbackFS
Expand All @@ -89,6 +99,7 @@ func (s *StdioServer) Run(ctx context.Context) error {
BackgroundCtx: ctx,
Logger: nil, // TODO: Add logging support
FS: fs,
PnpApi: pnpApi,
Options: &project.SessionOptions{
CurrentDirectory: s.options.Cwd,
DefaultLibraryPath: s.options.DefaultLibraryPath,
Expand Down
9 changes: 9 additions & 0 deletions tsc/internal/api/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/lsp/lsproto"
"github.com/microsoft/TypeScript/tsc/internal/module"
"github.com/microsoft/TypeScript/tsc/internal/nodebuilder"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/pprof"
"github.com/microsoft/TypeScript/tsc/internal/printer"
"github.com/microsoft/TypeScript/tsc/internal/project"
Expand Down Expand Up @@ -684,6 +685,13 @@ func (s *Session) DefaultLibraryPath() string {
return s.snapshotHost.DefaultLibraryPath()
}

func (s *Session) PnpApi() *pnp.PnpApi {
if s.projectSession != nil {
return s.projectSession.PnpApi()
}
return s.snapshotHost.PnpApi()
}

func (s *Session) useCaseSensitiveFileNames() bool {
return s.snapshotHost.FS().UseCaseSensitiveFileNames()
}
Expand Down Expand Up @@ -1943,6 +1951,7 @@ func (s *apiBuildSystem) ErrorWriter() io.Writer { return io.Discard }
func (s *apiBuildSystem) FS() vfs.FS { return s.session.snapshotHost.FS() }
func (s *apiBuildSystem) DefaultLibraryPath() string { return s.session.DefaultLibraryPath() }
func (s *apiBuildSystem) GetCurrentDirectory() string { return s.currentDirectory }
func (s *apiBuildSystem) PnpApi() *pnp.PnpApi { return s.session.PnpApi() }
func (s *apiBuildSystem) WriteOutputIsTTY() bool { return false }
func (s *apiBuildSystem) GetWidthOfTerminal() int { return 0 }
func (s *apiBuildSystem) GetEnvironmentVariable(name string) (string, bool) {
Expand Down
6 changes: 3 additions & 3 deletions tsc/internal/checker/checker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ foo.bar;`
fs = bundled.WrapFS(fs)

cd := "/"
host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand Down Expand Up @@ -86,7 +86,7 @@ export type E = D;`,
fs = bundled.WrapFS(fs)

cd := "/"
host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost(cd, fs, bundled.LibPath(), nil, nil, nil, nil)

parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile("/tsconfig.json", &core.CompilerOptions{}, nil, host, nil)
assert.Equal(t, len(errors), 0, "Expected no errors in parsed command line")
Expand Down Expand Up @@ -121,7 +121,7 @@ export type E = D;`,
func BenchmarkNewChecker(b *testing.B) {
fs := bundled.WrapFS(osvfs.FS())
rootPath := tspath.NormalizeSlashes(filepath.Join(repo.TestDataPath(), "fixtures/compiler"))
host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost(rootPath, fs, bundled.LibPath(), nil, nil, nil, nil)
parsed, errors := tsoptions.GetParsedCommandLineOfConfigFile(tspath.CombinePaths(rootPath, "tsconfig.json"), &core.CompilerOptions{}, nil, host, nil)
assert.Equal(b, len(errors), 0, "Expected no errors in parsed command line")
program := compiler.NewProgram(compiler.ProgramOptions{
Expand Down
2 changes: 1 addition & 1 deletion tsc/internal/compiler/contentmapper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func newContentMapperProgramWithOptions(t *testing.T, contentMapperProject conte
}
return compiler.NewProgram(compiler.ProgramOptions{
Config: config,
Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, contentMapperProject),
Host: compiler.NewCompilerHost("/src", fs, bundled.LibPath(), nil, nil, nil, contentMapperProject),
// Load files on the calling goroutine for deterministic diagnostics ordering.
SingleThreaded: core.TSTrue,
})
Expand Down
4 changes: 4 additions & 0 deletions tsc/internal/compiler/emitHost.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/module"
"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
"github.com/microsoft/TypeScript/tsc/internal/packagejson"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/printer"
"github.com/microsoft/TypeScript/tsc/internal/symlinks"
"github.com/microsoft/TypeScript/tsc/internal/transformers/declarations"
Expand All @@ -25,6 +26,7 @@ type EmitHost interface {
GetCurrentDirectory() string
CommonSourceDirectory() string
IsEmitBlocked(file string) bool
PnpApi() *pnp.PnpApi
}

var _ EmitHost = (*emitHost)(nil)
Expand Down Expand Up @@ -117,6 +119,8 @@ func (host *emitHost) UseCaseSensitiveFileNames() bool {
return host.program.UseCaseSensitiveFileNames()
}

func (host *emitHost) PnpApi() *pnp.PnpApi { return host.program.PnpApi() }

func (host *emitHost) IsEmitBlocked(file string) bool {
return host.program.IsEmitBlocked(file)
}
Expand Down
6 changes: 3 additions & 3 deletions tsc/internal/compiler/emit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func BenchmarkEmitLongLines(b *testing.B) {
OutDir: "/dev/out",
}

host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

p := compiler.NewProgram(compiler.ProgramOptions{
Config: &tsoptions.ParsedCommandLine{
Expand Down Expand Up @@ -106,7 +106,7 @@ func BenchmarkEmitManyFiles(b *testing.B) {
OutDir: "/dev/out",
}

host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

p := compiler.NewProgram(compiler.ProgramOptions{
Config: &tsoptions.ParsedCommandLine{
Expand Down Expand Up @@ -164,7 +164,7 @@ func BenchmarkEmitLongLinesWithLineBreaks(b *testing.B) {
OutDir: "/dev/out",
}

host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil)
host := compiler.NewCompilerHost("/dev/src", fs, bundled.LibPath(), nil, nil, nil, nil)

p := compiler.NewProgram(compiler.ProgramOptions{
Config: &tsoptions.ParsedCommandLine{
Expand Down
13 changes: 12 additions & 1 deletion tsc/internal/compiler/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/core"
"github.com/microsoft/TypeScript/tsc/internal/diagnostics"
"github.com/microsoft/TypeScript/tsc/internal/parser"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/tsoptions"
"github.com/microsoft/TypeScript/tsc/internal/tspath"
"github.com/microsoft/TypeScript/tsc/internal/vfs"
Expand All @@ -28,6 +29,7 @@ type CompilerHost interface {
// command line has no content mappers. The project owns transform identity and lifecycle state.
ContentMapperProject() contentmapper.Project
GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine
PnpApi() *pnp.PnpApi
}

var _ CompilerHost = (*compilerHost)(nil)
Expand All @@ -37,6 +39,7 @@ type compilerHost struct {
fs vfs.FS
defaultLibraryPath string
extendedConfigCache tsoptions.ExtendedConfigCache
pnpApi *pnp.PnpApi
trace func(msg *diagnostics.Message, args ...any)
contentMapperProject contentmapper.Project
}
Expand All @@ -46,29 +49,33 @@ func NewCachedFSCompilerHost(
fs vfs.FS,
defaultLibraryPath string,
extendedConfigCache tsoptions.ExtendedConfigCache,
pnpApi *pnp.PnpApi,
trace func(msg *diagnostics.Message, args ...any),
contentMapperProject contentmapper.Project,
) CompilerHost {
return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, trace, contentMapperProject)
return NewCompilerHost(currentDirectory, cachedvfs.From(fs), defaultLibraryPath, extendedConfigCache, pnpApi, trace, contentMapperProject)
}

func NewCompilerHost(
currentDirectory string,
fs vfs.FS,
defaultLibraryPath string,
extendedConfigCache tsoptions.ExtendedConfigCache,
pnpApi *pnp.PnpApi,
trace func(msg *diagnostics.Message, args ...any),
contentMapperProject contentmapper.Project,
) CompilerHost {
if trace == nil {
trace = func(msg *diagnostics.Message, args ...any) {}
}

return &compilerHost{
currentDirectory: currentDirectory,
fs: fs,
defaultLibraryPath: defaultLibraryPath,
extendedConfigCache: extendedConfigCache,
trace: trace,
pnpApi: pnpApi,
contentMapperProject: contentMapperProject,
}
}
Expand All @@ -85,6 +92,10 @@ func (h *compilerHost) GetCurrentDirectory() string {
return h.currentDirectory
}

func (h *compilerHost) PnpApi() *pnp.PnpApi {
return h.pnpApi
}

func (h *compilerHost) Trace(msg *diagnostics.Message, args ...any) {
h.trace(msg, args...)
}
Expand Down
6 changes: 6 additions & 0 deletions tsc/internal/compiler/program.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/microsoft/TypeScript/tsc/internal/outputpaths"
"github.com/microsoft/TypeScript/tsc/internal/packagejson"
"github.com/microsoft/TypeScript/tsc/internal/parser"
"github.com/microsoft/TypeScript/tsc/internal/pnp"
"github.com/microsoft/TypeScript/tsc/internal/printer"
"github.com/microsoft/TypeScript/tsc/internal/scanner"
"github.com/microsoft/TypeScript/tsc/internal/sourcemap"
Expand Down Expand Up @@ -151,6 +152,11 @@ func (p *Program) GetCurrentDirectory() string {
return p.Host().GetCurrentDirectory()
}

// PnpApi implements checker.Program.
func (p *Program) PnpApi() *pnp.PnpApi {
return p.Host().PnpApi()
}

func (p *Program) ContentMapperProject() contentmapper.Project {
return p.hosts.Host.ContentMapperProject()
}
Expand Down
Loading
Loading