Skip to content

Commit b278afd

Browse files
authored
Fix various named enum types (#1973)
1 parent 6642b0a commit b278afd

File tree

9 files changed

+15
-16
lines changed

9 files changed

+15
-16
lines changed

internal/ast/parseoptions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/microsoft/typescript-go/internal/tspath"
66
)
77

8-
type JSDocParsingMode int
8+
type JSDocParsingMode uint8
99

1010
const (
1111
JSDocParsingModeParseAll JSDocParsingMode = iota

internal/ast/subtreefacts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/microsoft/typescript-go/internal/core"
55
)
66

7-
type SubtreeFacts int32
7+
type SubtreeFacts uint32
88

99
const (
1010
// Facts

internal/checker/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const TypeFormatFlagsNodeBuilderFlagsMask = TypeFormatFlagsNoTruncation | TypeFo
8282
TypeFormatFlagsUseTypeOfFunction | TypeFormatFlagsOmitParameterModifiers | TypeFormatFlagsUseAliasDefinedOutsideCurrentScope | TypeFormatFlagsAllowUniqueESSymbolType | TypeFormatFlagsInTypeAlias |
8383
TypeFormatFlagsUseSingleQuotesForStringLiteralType | TypeFormatFlagsNoTypeReduction | TypeFormatFlagsOmitThisParameter
8484

85-
type SymbolFormatFlags int32
85+
type SymbolFormatFlags uint32
8686

8787
const (
8888
SymbolFormatFlagsNone SymbolFormatFlags = 0

internal/module/resolver_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ type rawArgs struct {
211211
Name string `json:"name"`
212212
ContainingFile string `json:"containingFile"`
213213
CompilerOptions *core.CompilerOptions `json:"compilerOptions"`
214-
ResolutionMode int `json:"resolutionMode"`
214+
ResolutionMode core.ModuleKind `json:"resolutionMode"`
215215
RedirectedRef *struct {
216216
SourceFile struct {
217217
FileName string `json:"fileName"`
@@ -265,7 +265,7 @@ func doCall(t *testing.T, resolver *module.Resolver, call functionCall, skipLoca
265265

266266
errorMessageArgs := []any{call.args.Name, call.args.ContainingFile}
267267
if call.call == "resolveModuleName" {
268-
resolved, _ := resolver.ResolveModuleName(call.args.Name, call.args.ContainingFile, core.ModuleKind(call.args.ResolutionMode), redirectedReference)
268+
resolved, _ := resolver.ResolveModuleName(call.args.Name, call.args.ContainingFile, call.args.ResolutionMode, redirectedReference)
269269
assert.Check(t, resolved != nil, "ResolveModuleName should not return nil", errorMessageArgs)
270270
if expectedResolvedModule, ok := call.returnValue["resolvedModule"].(map[string]any); ok {
271271
assert.Check(t, resolved.IsResolved(), errorMessageArgs)
@@ -277,7 +277,7 @@ func doCall(t *testing.T, resolver *module.Resolver, call functionCall, skipLoca
277277
assert.Check(t, !resolved.IsResolved(), errorMessageArgs)
278278
}
279279
} else {
280-
resolved, _ := resolver.ResolveTypeReferenceDirective(call.args.Name, call.args.ContainingFile, core.ModuleKind(call.args.ResolutionMode), redirectedReference)
280+
resolved, _ := resolver.ResolveTypeReferenceDirective(call.args.Name, call.args.ContainingFile, call.args.ResolutionMode, redirectedReference)
281281
assert.Check(t, resolved != nil, "ResolveTypeReferenceDirective should not return nil", errorMessageArgs)
282282
if expectedResolvedTypeReferenceDirective, ok := call.returnValue["resolvedTypeReferenceDirective"].(map[string]any); ok {
283283
assert.Check(t, resolved.IsResolved(), errorMessageArgs)

internal/nodebuilder/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type SymbolTracker interface {
2626
}
2727

2828
// NOTE: If modifying this enum, must modify `TypeFormatFlags` too!
29-
type Flags int32
29+
type Flags uint32
3030

3131
const (
3232
FlagsNone Flags = 0

internal/parser/parser_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ func FuzzParser(f *testing.F) {
111111
sourceText, err := os.ReadFile(file.path)
112112
assert.NilError(f, err)
113113
extension := tspath.TryGetExtensionFromPath(file.path)
114-
f.Add(extension, string(sourceText), int(core.ScriptTargetESNext), int(ast.JSDocParsingModeParseAll))
114+
f.Add(extension, string(sourceText), int32(core.ScriptTargetESNext), uint8(ast.JSDocParsingModeParseAll))
115115
}
116116
}
117117

118-
f.Fuzz(func(t *testing.T, extension string, sourceText string, scriptTarget_ int, jsdocParsingMode_ int) {
118+
f.Fuzz(func(t *testing.T, extension string, sourceText string, scriptTarget_ int32, jsdocParsingMode_ uint8) {
119119
scriptTarget := core.ScriptTarget(scriptTarget_)
120120
jsdocParsingMode := ast.JSDocParsingMode(jsdocParsingMode_)
121121

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
go test fuzz v1
22
string(".ts")
33
string("/**@0\n * */0")
4-
int(99)
5-
int(0)
4+
int32(99)
5+
uint8(0)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
go test fuzz v1
22
string(".ts")
33
string("/")
4-
int(99)
5-
int(1)
4+
int32(99)
5+
uint8(1)

internal/vfs/utilities.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,10 @@ var (
314314
)
315315

316316
func GetRegexFromPattern(pattern string, useCaseSensitiveFileNames bool) *regexp2.Regexp {
317-
flags := regexp2.ECMAScript
317+
opts := regexp2.RegexOptions(regexp2.ECMAScript)
318318
if !useCaseSensitiveFileNames {
319-
flags |= regexp2.IgnoreCase
319+
opts |= regexp2.IgnoreCase
320320
}
321-
opts := regexp2.RegexOptions(flags)
322321

323322
key := regexp2CacheKey{pattern, opts}
324323

0 commit comments

Comments
 (0)