Skip to content

Commit 93c5db7

Browse files
jakebaileyjakebailey
authored
Move unrelated subpackages out of compiler dir (microsoft#232)
1 parent 8b5e074 commit 93c5db7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+50
-50
lines changed

‎cmd/tsgo/main.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414

1515
"github.com/microsoft/typescript-go/internal/ast"
1616
"github.com/microsoft/typescript-go/internal/bundled"
17-
ts "github.com/microsoft/typescript-go/internal/compiler"
18-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
17+
"github.com/microsoft/typescript-go/internal/compiler"
1918
"github.com/microsoft/typescript-go/internal/core"
19+
"github.com/microsoft/typescript-go/internal/diagnostics"
2020
"github.com/microsoft/typescript-go/internal/diagnosticwriter"
2121
"github.com/microsoft/typescript-go/internal/execute"
2222
"github.com/microsoft/typescript-go/internal/pprof"
@@ -169,10 +169,10 @@ func runMain() int {
169169

170170
currentDirectory = tspath.GetDirectoryPath(configFileName)
171171
// !!! is the working directory actually the config path?
172-
host := ts.NewCachedFSCompilerHost(compilerOptions, currentDirectory, fs, defaultLibraryPath)
172+
host := compiler.NewCachedFSCompilerHost(compilerOptions, currentDirectory, fs, defaultLibraryPath)
173173

174174
parseStart := time.Now()
175-
program := ts.NewProgram(ts.ProgramOptions{
175+
program := compiler.NewProgram(compiler.ProgramOptions{
176176
ConfigFileName: configFileName,
177177
Options: compilerOptions,
178178
SingleThreaded: opts.devel.singleThreaded,
@@ -226,7 +226,7 @@ func runMain() int {
226226
var emitTime time.Duration
227227
if compilerOptions.NoEmit.IsFalseOrUnknown() {
228228
emitStart := time.Now()
229-
result := program.Emit(ts.EmitOptions{})
229+
result := program.Emit(compiler.EmitOptions{})
230230
diagnostics = append(diagnostics, result.Diagnostics...)
231231
emitTime = time.Since(emitStart)
232232
}
@@ -242,7 +242,7 @@ func runMain() int {
242242
exitCode := 0
243243
if len(diagnostics) != 0 {
244244
if !opts.devel.quiet {
245-
printDiagnostics(ts.SortAndDeduplicateDiagnostics(diagnostics), host, compilerOptions)
245+
printDiagnostics(compiler.SortAndDeduplicateDiagnostics(diagnostics), host, compilerOptions)
246246
}
247247
exitCode = 1
248248
}
@@ -315,21 +315,21 @@ func formatDuration(d time.Duration) string {
315315
return fmt.Sprintf("%.3fs", d.Seconds())
316316
}
317317

318-
func identifierCount(p *ts.Program) int {
318+
func identifierCount(p *compiler.Program) int {
319319
count := 0
320320
for _, file := range p.SourceFiles() {
321321
count += file.IdentifierCount
322322
}
323323
return count
324324
}
325325

326-
func listFiles(p *ts.Program) {
326+
func listFiles(p *compiler.Program) {
327327
for _, file := range p.SourceFiles() {
328328
fmt.Println(file.FileName())
329329
}
330330
}
331331

332-
func getFormatOpts(host ts.CompilerHost) *diagnosticwriter.FormattingOptions {
332+
func getFormatOpts(host compiler.CompilerHost) *diagnosticwriter.FormattingOptions {
333333
return &diagnosticwriter.FormattingOptions{
334334
NewLine: host.NewLine(),
335335
ComparePathsOptions: tspath.ComparePathsOptions{
@@ -339,7 +339,7 @@ func getFormatOpts(host ts.CompilerHost) *diagnosticwriter.FormattingOptions {
339339
}
340340
}
341341

342-
func printDiagnostics(diagnostics []*ast.Diagnostic, host ts.CompilerHost, compilerOptions *core.CompilerOptions) {
342+
func printDiagnostics(diagnostics []*ast.Diagnostic, host compiler.CompilerHost, compilerOptions *core.CompilerOptions) {
343343
formatOpts := getFormatOpts(host)
344344
if compilerOptions.Pretty.IsTrueOrUnknown() {
345345
diagnosticwriter.FormatDiagnosticsWithColorAndContext(os.Stdout, diagnostics, formatOpts)

‎internal/ast/diagnostic.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"slices"
66
"strings"
77

8-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
98
"github.com/microsoft/typescript-go/internal/core"
9+
"github.com/microsoft/typescript-go/internal/diagnostics"
1010
)
1111

1212
// Diagnostic

‎internal/binder/binder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"sync"
77

88
"github.com/microsoft/typescript-go/internal/ast"
9-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
109
"github.com/microsoft/typescript-go/internal/core"
10+
"github.com/microsoft/typescript-go/internal/diagnostics"
1111
"github.com/microsoft/typescript-go/internal/scanner"
1212
"github.com/microsoft/typescript-go/internal/tspath"
1313
)

‎internal/binder/nameresolver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package binder
22

33
import (
44
"github.com/microsoft/typescript-go/internal/ast"
5-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
65
"github.com/microsoft/typescript-go/internal/core"
6+
"github.com/microsoft/typescript-go/internal/diagnostics"
77
)
88

99
type NameResolver struct {

‎internal/binder/referenceresolver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package binder
22

33
import (
44
"github.com/microsoft/typescript-go/internal/ast"
5-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
65
"github.com/microsoft/typescript-go/internal/core"
6+
"github.com/microsoft/typescript-go/internal/diagnostics"
77
)
88

99
type ReferenceResolver interface {

‎internal/checker/checker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/microsoft/typescript-go/internal/ast"
1616
"github.com/microsoft/typescript-go/internal/binder"
1717
"github.com/microsoft/typescript-go/internal/collections"
18-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
1918
"github.com/microsoft/typescript-go/internal/core"
19+
"github.com/microsoft/typescript-go/internal/diagnostics"
2020
"github.com/microsoft/typescript-go/internal/evaluator"
2121
"github.com/microsoft/typescript-go/internal/jsnum"
2222
"github.com/microsoft/typescript-go/internal/printer"

‎internal/checker/flow.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/microsoft/typescript-go/internal/ast"
1010
"github.com/microsoft/typescript-go/internal/binder"
11-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
1211
"github.com/microsoft/typescript-go/internal/core"
12+
"github.com/microsoft/typescript-go/internal/diagnostics"
1313
"github.com/microsoft/typescript-go/internal/evaluator"
1414
"github.com/microsoft/typescript-go/internal/scanner"
1515
)

‎internal/checker/grammarchecks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/microsoft/typescript-go/internal/ast"
88
"github.com/microsoft/typescript-go/internal/binder"
9-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
109
"github.com/microsoft/typescript-go/internal/core"
10+
"github.com/microsoft/typescript-go/internal/diagnostics"
1111
"github.com/microsoft/typescript-go/internal/jsnum"
1212
"github.com/microsoft/typescript-go/internal/scanner"
1313
"github.com/microsoft/typescript-go/internal/tspath"

‎internal/checker/jsx.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"slices"
66

77
"github.com/microsoft/typescript-go/internal/ast"
8-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
98
"github.com/microsoft/typescript-go/internal/core"
9+
"github.com/microsoft/typescript-go/internal/diagnostics"
1010
"github.com/microsoft/typescript-go/internal/jsnum"
1111
"github.com/microsoft/typescript-go/internal/parser"
1212
"github.com/microsoft/typescript-go/internal/scanner"

‎internal/checker/relater.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/microsoft/typescript-go/internal/ast"
99
"github.com/microsoft/typescript-go/internal/binder"
10-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
1110
"github.com/microsoft/typescript-go/internal/core"
11+
"github.com/microsoft/typescript-go/internal/diagnostics"
1212
"github.com/microsoft/typescript-go/internal/jsnum"
1313
"github.com/microsoft/typescript-go/internal/scanner"
1414
)

0 commit comments

Comments
 (0)