Skip to content

Commit 93c5db7

Browse files
authored
Move unrelated subpackages out of compiler dir (#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
)

internal/checker/utilities.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/jsnum"
1414
"github.com/microsoft/typescript-go/internal/scanner"
1515
)

internal/compiler/emitter.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/printer"
1212
"github.com/microsoft/typescript-go/internal/sourcemap"
1313
"github.com/microsoft/typescript-go/internal/stringutil"

internal/compiler/fileloader.go

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

1111
"github.com/microsoft/typescript-go/internal/ast"
1212
"github.com/microsoft/typescript-go/internal/collections"
13-
"github.com/microsoft/typescript-go/internal/compiler/module"
1413
"github.com/microsoft/typescript-go/internal/core"
14+
"github.com/microsoft/typescript-go/internal/module"
1515
"github.com/microsoft/typescript-go/internal/tsoptions"
1616
"github.com/microsoft/typescript-go/internal/tspath"
1717
)

internal/compiler/program.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/microsoft/typescript-go/internal/ast"
99
"github.com/microsoft/typescript-go/internal/binder"
1010
"github.com/microsoft/typescript-go/internal/checker"
11-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
12-
"github.com/microsoft/typescript-go/internal/compiler/module"
1311
"github.com/microsoft/typescript-go/internal/core"
12+
"github.com/microsoft/typescript-go/internal/diagnostics"
13+
"github.com/microsoft/typescript-go/internal/module"
1414
"github.com/microsoft/typescript-go/internal/parser"
1515
"github.com/microsoft/typescript-go/internal/printer"
1616
"github.com/microsoft/typescript-go/internal/scanner"

internal/diagnosticwriter/diagnosticwriter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"unicode"
1111

1212
"github.com/microsoft/typescript-go/internal/ast"
13-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
13+
"github.com/microsoft/typescript-go/internal/diagnostics"
1414
"github.com/microsoft/typescript-go/internal/scanner"
1515
"github.com/microsoft/typescript-go/internal/tspath"
1616
)

internal/execute/outputs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/microsoft/typescript-go/internal/ast"
99
"github.com/microsoft/typescript-go/internal/collections"
1010
"github.com/microsoft/typescript-go/internal/compiler"
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/diagnosticwriter"
1414
"github.com/microsoft/typescript-go/internal/tsoptions"
1515
"github.com/microsoft/typescript-go/internal/tspath"

internal/execute/tsc.go

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

66
"github.com/microsoft/typescript-go/internal/ast"
77
"github.com/microsoft/typescript-go/internal/compiler"
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/tsoptions"
1111
"github.com/microsoft/typescript-go/internal/tspath"
1212
)

internal/ls/converters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"unicode/utf8"
1010

1111
"github.com/microsoft/typescript-go/internal/ast"
12-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
1312
"github.com/microsoft/typescript-go/internal/core"
13+
"github.com/microsoft/typescript-go/internal/diagnostics"
1414
"github.com/microsoft/typescript-go/internal/lsp/lsproto"
1515
)
1616

internal/compiler/module/cache.go renamed to internal/module/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package module
33
import (
44
"sync"
55

6-
"github.com/microsoft/typescript-go/internal/compiler/packagejson"
76
"github.com/microsoft/typescript-go/internal/core"
7+
"github.com/microsoft/typescript-go/internal/packagejson"
88
)
99

1010
type ModeAwareCache[T any] map[ModeAwareCacheKey]T

internal/compiler/module/resolver.go renamed to internal/module/resolver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/microsoft/typescript-go/internal/ast"
99
"github.com/microsoft/typescript-go/internal/collections"
10-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
11-
"github.com/microsoft/typescript-go/internal/compiler/packagejson"
1210
"github.com/microsoft/typescript-go/internal/core"
11+
"github.com/microsoft/typescript-go/internal/diagnostics"
12+
"github.com/microsoft/typescript-go/internal/packagejson"
1313
"github.com/microsoft/typescript-go/internal/semver"
1414
"github.com/microsoft/typescript-go/internal/tspath"
1515
)

internal/compiler/module/resolver_test.go renamed to internal/module/resolver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212

1313
"github.com/microsoft/typescript-go/internal/ast"
14-
"github.com/microsoft/typescript-go/internal/compiler/module"
1514
"github.com/microsoft/typescript-go/internal/core"
15+
"github.com/microsoft/typescript-go/internal/module"
1616
"github.com/microsoft/typescript-go/internal/repo"
1717
"github.com/microsoft/typescript-go/internal/testutil/baseline"
1818
"github.com/microsoft/typescript-go/internal/tspath"
File renamed without changes.
File renamed without changes.

internal/compiler/packagejson/cache.go renamed to internal/packagejson/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"sync"
55

66
"github.com/microsoft/typescript-go/internal/collections"
7-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
87
"github.com/microsoft/typescript-go/internal/core"
8+
"github.com/microsoft/typescript-go/internal/diagnostics"
99
"github.com/microsoft/typescript-go/internal/semver"
1010
"github.com/microsoft/typescript-go/internal/tspath"
1111
)

internal/compiler/packagejson/expected_test.go renamed to internal/packagejson/expected_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/microsoft/typescript-go/internal/compiler/packagejson"
7+
"github.com/microsoft/typescript-go/internal/packagejson"
88
"gotest.tools/v3/assert"
99
)
1010

internal/compiler/packagejson/exportsorimports_test.go renamed to internal/packagejson/exportsorimports_test.go

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

77
json2 "github.com/go-json-experiment/json"
8-
"github.com/microsoft/typescript-go/internal/compiler/packagejson"
8+
"github.com/microsoft/typescript-go/internal/packagejson"
99
"gotest.tools/v3/assert"
1010
)
1111

internal/compiler/packagejson/jsonvalue_test.go renamed to internal/packagejson/jsonvalue_test.go

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

77
json2 "github.com/go-json-experiment/json"
8-
"github.com/microsoft/typescript-go/internal/compiler/packagejson"
8+
"github.com/microsoft/typescript-go/internal/packagejson"
99
"gotest.tools/v3/assert"
1010
)
1111

internal/compiler/packagejson/packagejson_test.go renamed to internal/packagejson/packagejson_test.go

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

88
json2 "github.com/go-json-experiment/json"
9-
"github.com/microsoft/typescript-go/internal/compiler/packagejson"
9+
"github.com/microsoft/typescript-go/internal/packagejson"
1010
"github.com/microsoft/typescript-go/internal/parser"
1111
"github.com/microsoft/typescript-go/internal/repo"
1212
"github.com/microsoft/typescript-go/internal/testutil/filefixture"

internal/parser/jsdoc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strings"
55

66
"github.com/microsoft/typescript-go/internal/ast"
7-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
87
"github.com/microsoft/typescript-go/internal/core"
8+
"github.com/microsoft/typescript-go/internal/diagnostics"
99
"github.com/microsoft/typescript-go/internal/stringutil"
1010
)
1111

internal/parser/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"sync"
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/scanner"
1111
"github.com/microsoft/typescript-go/internal/tspath"
1212
)

internal/scanner/scanner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"unicode/utf8"
1010

1111
"github.com/microsoft/typescript-go/internal/ast"
12-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
1312
"github.com/microsoft/typescript-go/internal/core"
13+
"github.com/microsoft/typescript-go/internal/diagnostics"
1414
"github.com/microsoft/typescript-go/internal/jsnum"
1515
"github.com/microsoft/typescript-go/internal/stringutil"
1616
)

internal/tsoptions/commandlineoption.go

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

33
import (
44
"github.com/microsoft/typescript-go/internal/collections"
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 CommandLineOptionKind string

internal/tsoptions/commandlineparser.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/collections"
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/stringutil"
1212
"github.com/microsoft/typescript-go/internal/vfs"
1313
)

internal/tsoptions/commandlineparser_test.go

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

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/diagnosticwriter"
1313
"github.com/microsoft/typescript-go/internal/repo"
1414
"github.com/microsoft/typescript-go/internal/testutil/baseline"

internal/tsoptions/declsbuild.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package tsoptions
33
import (
44
"slices"
55

6-
"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
6+
"github.com/microsoft/typescript-go/internal/diagnostics"
77
)
88

99
var BuildOpts = slices.Concat(commonOptionsWithBuild, optionsForBuild)

0 commit comments

Comments
 (0)