Skip to content

Commit 6757fe3

Browse files
sheetalkamatsheetalkamat
committed
change to test
1 parent b681785 commit 6757fe3

File tree

5 files changed

+77
-77
lines changed

5 files changed

+77
-77
lines changed

‎internal/incremental/affectedfileshandler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func (h *affectedFilesHandler) handleDtsMayChangeOf(dtsMayChange dtsMayChange, p
325325
if invalidateJsFiles {
326326
dtsMayChange.addFileToAffectedFilesPendingEmit(path, GetFileEmitKind(h.program.snapshot.options))
327327
} else if h.program.snapshot.options.GetEmitDeclarations() {
328-
dtsMayChange.addFileToAffectedFilesPendingEmit(path, core.IfElse(h.program.snapshot.options.DeclarationMap.IsTrue(), fileEmitKindAllDts, fileEmitKindDts))
328+
dtsMayChange.addFileToAffectedFilesPendingEmit(path, core.IfElse(h.program.snapshot.options.DeclarationMap.IsTrue(), FileEmitKindAllDts, FileEmitKindDts))
329329
}
330330
}
331331

‎internal/incremental/buildInfo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func (b *BuildInfoFilePendingEmit) MarshalJSON() ([]byte, error) {
278278
if b.EmitKind == 0 {
279279
return json.Marshal(b.FileId)
280280
}
281-
if b.EmitKind == fileEmitKindDts {
281+
if b.EmitKind == FileEmitKindDts {
282282
fileListIds := []BuildInfoFileId{b.FileId}
283283
return json.Marshal(fileListIds)
284284
}
@@ -299,7 +299,7 @@ func (b *BuildInfoFilePendingEmit) UnmarshalJSON(data []byte) error {
299299
if len(intTuple) == 1 {
300300
*b = BuildInfoFilePendingEmit{
301301
FileId: BuildInfoFileId(intTuple[0]),
302-
EmitKind: fileEmitKindDts,
302+
EmitKind: FileEmitKindDts,
303303
}
304304
return nil
305305
} else if len(intTuple) == 2 {

‎internal/incremental/emitfileshandler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ type emitFilesHandler struct {
3131
func (h *emitFilesHandler) getPendingEmitKindForEmitOptions(emitKind FileEmitKind, options compiler.EmitOptions) FileEmitKind {
3232
pendingKind := getPendingEmitKind(emitKind, 0)
3333
if options.EmitOnly == compiler.EmitOnlyDts {
34-
pendingKind &= fileEmitKindAllDts
34+
pendingKind &= FileEmitKindAllDts
3535
}
3636
if h.isForDtsErrors {
37-
pendingKind &= fileEmitKindDtsErrors
37+
pendingKind &= FileEmitKindDtsErrors
3838
}
3939
return pendingKind
4040
}
@@ -64,10 +64,10 @@ func (h *emitFilesHandler) emitAllAffectedFiles(options compiler.EmitOptions) *c
6464
wg.Queue(func() {
6565
// Determine if we can do partial emit
6666
var emitOnly compiler.EmitOnly
67-
if (pendingKind & fileEmitKindAllJs) != 0 {
67+
if (pendingKind & FileEmitKindAllJs) != 0 {
6868
emitOnly = compiler.EmitOnlyJs
6969
}
70-
if (pendingKind & fileEmitKindAllDts) != 0 {
70+
if (pendingKind & FileEmitKindAllDts) != 0 {
7171
if emitOnly == compiler.EmitOnlyJs {
7272
emitOnly = compiler.EmitAll
7373
} else {

‎internal/incremental/snapshot.go

Lines changed: 28 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package incremental
33
import (
44
"context"
55
"maps"
6-
"strings"
76
"sync"
87

98
"github.com/microsoft/typescript-go/internal/ast"
@@ -31,77 +30,37 @@ func (f *fileInfo) ImpliedNodeFormat() core.ResolutionMode { return f.impliedNod
3130
type FileEmitKind uint32
3231

3332
const (
34-
fileEmitKindNone FileEmitKind = 0
35-
fileEmitKindJs FileEmitKind = 1 << 0 // emit js file
36-
fileEmitKindJsMap FileEmitKind = 1 << 1 // emit js.map file
37-
fileEmitKindJsInlineMap FileEmitKind = 1 << 2 // emit inline source map in js file
38-
fileEmitKindDtsErrors FileEmitKind = 1 << 3 // emit dts errors
39-
fileEmitKindDtsEmit FileEmitKind = 1 << 4 // emit d.ts file
40-
fileEmitKindDtsMap FileEmitKind = 1 << 5 // emit d.ts.map file
41-
42-
fileEmitKindDts = fileEmitKindDtsErrors | fileEmitKindDtsEmit
43-
fileEmitKindAllJs = fileEmitKindJs | fileEmitKindJsMap | fileEmitKindJsInlineMap
44-
fileEmitKindAllDtsEmit = fileEmitKindDtsEmit | fileEmitKindDtsMap
45-
fileEmitKindAllDts = fileEmitKindDts | fileEmitKindDtsMap
46-
fileEmitKindAll = fileEmitKindAllJs | fileEmitKindAllDts
33+
FileEmitKindNone FileEmitKind = 0
34+
FileEmitKindJs FileEmitKind = 1 << 0 // emit js file
35+
FileEmitKindJsMap FileEmitKind = 1 << 1 // emit js.map file
36+
FileEmitKindJsInlineMap FileEmitKind = 1 << 2 // emit inline source map in js file
37+
FileEmitKindDtsErrors FileEmitKind = 1 << 3 // emit dts errors
38+
FileEmitKindDtsEmit FileEmitKind = 1 << 4 // emit d.ts file
39+
FileEmitKindDtsMap FileEmitKind = 1 << 5 // emit d.ts.map file
40+
41+
FileEmitKindDts = FileEmitKindDtsErrors | FileEmitKindDtsEmit
42+
FileEmitKindAllJs = FileEmitKindJs | FileEmitKindJsMap | FileEmitKindJsInlineMap
43+
FileEmitKindAllDtsEmit = FileEmitKindDtsEmit | FileEmitKindDtsMap
44+
FileEmitKindAllDts = FileEmitKindDts | FileEmitKindDtsMap
45+
FileEmitKindAll = FileEmitKindAllJs | FileEmitKindAllDts
4746
)
4847

49-
func (fileEmitKind FileEmitKind) String() string {
50-
var builder strings.Builder
51-
addFlags := func(flags string) {
52-
if builder.Len() == 0 {
53-
builder.WriteString(flags)
54-
} else {
55-
builder.WriteString("|")
56-
builder.WriteString(flags)
57-
}
58-
}
59-
if fileEmitKind != 0 {
60-
if (fileEmitKind & fileEmitKindJs) != 0 {
61-
addFlags("Js")
62-
}
63-
if (fileEmitKind & fileEmitKindJsMap) != 0 {
64-
addFlags("JsMap")
65-
}
66-
if (fileEmitKind & fileEmitKindJsInlineMap) != 0 {
67-
addFlags("JsInlineMap")
68-
}
69-
if (fileEmitKind & fileEmitKindDts) == fileEmitKindDts {
70-
addFlags("Dts")
71-
} else {
72-
if (fileEmitKind & fileEmitKindDtsEmit) != 0 {
73-
addFlags("DtsEmit")
74-
}
75-
if (fileEmitKind & fileEmitKindDtsErrors) != 0 {
76-
addFlags("DtsErrors")
77-
}
78-
}
79-
if (fileEmitKind & fileEmitKindDtsMap) != 0 {
80-
addFlags("DtsMap")
81-
}
82-
}
83-
if builder.Len() != 0 {
84-
return builder.String()
85-
}
86-
return "None"
87-
}
88-
8948
func GetFileEmitKind(options *core.CompilerOptions) FileEmitKind {
90-
result := fileEmitKindJs
49+
result := FileEmitKindJs
9150
if options.SourceMap.IsTrue() {
92-
result |= fileEmitKindJsMap
51+
result |= FileEmitKindJsMap
9352
}
9453
if options.InlineSourceMap.IsTrue() {
95-
result |= fileEmitKindJsInlineMap
54+
result |= FileEmitKindJsInlineMap
9655
}
9756
if options.GetEmitDeclarations() {
98-
result |= fileEmitKindDts
57+
result |= FileEmitKindDts
9958
}
10059
if options.DeclarationMap.IsTrue() {
101-
result |= fileEmitKindDtsMap
60+
result |= FileEmitKindDtsMap
10261
}
10362
if options.EmitDeclarationOnly.IsTrue() {
104-
result &= fileEmitKindAllDts
63+
result &= FileEmitKindAllDts
10564
}
10665
return result
10766
}
@@ -114,24 +73,24 @@ func getPendingEmitKindWithOptions(options *core.CompilerOptions, oldOptions *co
11473

11574
func getPendingEmitKind(emitKind FileEmitKind, oldEmitKind FileEmitKind) FileEmitKind {
11675
if oldEmitKind == emitKind {
117-
return fileEmitKindNone
76+
return FileEmitKindNone
11877
}
11978
if oldEmitKind == 0 || emitKind == 0 {
12079
return emitKind
12180
}
12281
diff := oldEmitKind ^ emitKind
123-
result := fileEmitKindNone
82+
result := FileEmitKindNone
12483
// If there is diff in Js emit, pending emit is js emit flags
125-
if (diff & fileEmitKindAllJs) != 0 {
126-
result |= emitKind & fileEmitKindAllJs
84+
if (diff & FileEmitKindAllJs) != 0 {
85+
result |= emitKind & FileEmitKindAllJs
12786
}
12887
// If dts errors pending, add dts errors flag
129-
if (diff & fileEmitKindDtsErrors) != 0 {
130-
result |= emitKind & fileEmitKindDtsErrors
88+
if (diff & FileEmitKindDtsErrors) != 0 {
89+
result |= emitKind & FileEmitKindDtsErrors
13190
}
13291
// If there is diff in Dts emit, pending emit is dts emit flags
133-
if (diff & fileEmitKindAllDtsEmit) != 0 {
134-
result |= emitKind & fileEmitKindAllDtsEmit
92+
if (diff & FileEmitKindAllDtsEmit) != 0 {
93+
result |= emitKind & FileEmitKindAllDtsEmit
13594
}
13695
return result
13796
}
@@ -447,7 +406,7 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
447406
} else {
448407
pendingEmitKind = getPendingEmitKindWithOptions(snapshot.options, oldProgram.snapshot.options)
449408
}
450-
if pendingEmitKind != fileEmitKindNone {
409+
if pendingEmitKind != FileEmitKindNone {
451410
// Add all files to affectedFilesPendingEmit since emit changed
452411
for _, file := range files {
453412
// Add to affectedFilesPending emit only if not changed since any changed file will do full emit

‎internal/testutil/incrementaltestutil/readablebuildinfo.go

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package incrementaltestutil
33
import (
44
"encoding/json"
55
"fmt"
6+
"strings"
67

78
"github.com/microsoft/typescript-go/internal/collections"
89
"github.com/microsoft/typescript-go/internal/core"
@@ -299,12 +300,52 @@ func (r *readableBuildInfo) setAffectedFilesPendingEmit() {
299300
emitKind := core.IfElse(pendingEmit.EmitKind == 0, fullEmitKind, pendingEmit.EmitKind)
300301
return &readableBuildInfoFilePendingEmit{
301302
file: r.toFilePath(pendingEmit.FileId),
302-
emitKind: emitKind.String(),
303+
emitKind: toReadableFileEmitKind(emitKind),
303304
original: pendingEmit,
304305
}
305306
})
306307
}
307308

309+
func toReadableFileEmitKind(fileEmitKind incremental.FileEmitKind) string {
310+
var builder strings.Builder
311+
addFlags := func(flags string) {
312+
if builder.Len() == 0 {
313+
builder.WriteString(flags)
314+
} else {
315+
builder.WriteString("|")
316+
builder.WriteString(flags)
317+
}
318+
}
319+
if fileEmitKind != 0 {
320+
if (fileEmitKind & incremental.FileEmitKindJs) != 0 {
321+
addFlags("Js")
322+
}
323+
if (fileEmitKind & incremental.FileEmitKindJsMap) != 0 {
324+
addFlags("JsMap")
325+
}
326+
if (fileEmitKind & incremental.FileEmitKindJsInlineMap) != 0 {
327+
addFlags("JsInlineMap")
328+
}
329+
if (fileEmitKind & incremental.FileEmitKindDts) == incremental.FileEmitKindDts {
330+
addFlags("Dts")
331+
} else {
332+
if (fileEmitKind & incremental.FileEmitKindDtsEmit) != 0 {
333+
addFlags("DtsEmit")
334+
}
335+
if (fileEmitKind & incremental.FileEmitKindDtsErrors) != 0 {
336+
addFlags("DtsErrors")
337+
}
338+
}
339+
if (fileEmitKind & incremental.FileEmitKindDtsMap) != 0 {
340+
addFlags("DtsMap")
341+
}
342+
}
343+
if builder.Len() != 0 {
344+
return builder.String()
345+
}
346+
return "None"
347+
}
348+
308349
func (r *readableBuildInfo) setEmitSignatures() {
309350
r.EmitSignatures = core.Map(r.buildInfo.EmitSignatures, func(signature *incremental.BuildInfoEmitSignature) *readableBuildInfoEmitSignature {
310351
return &readableBuildInfoEmitSignature{

0 commit comments

Comments
 (0)