make a few code edits from some random github bot

evanw · Dec 18, 2023 · 7a225ff · 7a225ff
1 parent aa46b2c
commit 7a225ff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/internal/bundler/bundler.go b/internal/bundler/bundler.go
@@ -682,10 +682,7 @@ func ResolveFailureErrorTextSuggestionNotes(
 	}
 
 	if platform != config.PlatformNode {
-		pkg := path
-		if strings.HasPrefix(pkg, "node:") {
-			pkg = pkg[5:]
-		}
+		pkg := strings.TrimPrefix(path, "node:")
 		if resolver.BuiltInNodeModules[pkg] {
 			var how string
 			switch logger.API {

diff --git a/internal/css_parser/css_parser_selector.go b/internal/css_parser/css_parser_selector.go
@@ -854,8 +854,8 @@ func (p *parser) parseNthIndex() (css_ast.NthIndex, bool) {
 		if strings.HasPrefix(text0, "-") {
 			bNeg = true
 			text0 = text0[1:]
-		} else if strings.HasPrefix(text0, "+") {
-			text0 = text0[1:]
+		} else {
+			text0 = strings.TrimPrefix(text0, "+")
 		}
 		if b, ok := parseInteger(text0); ok {
 			if bNeg {
@@ -887,8 +887,8 @@ func (p *parser) parseNthIndex() (css_ast.NthIndex, bool) {
 		if strings.HasPrefix(text0, "-") {
 			aSign = negative
 			text0 = text0[1:]
-		} else if strings.HasPrefix(text0, "+") {
-			text0 = text0[1:]
+		} else {
+			text0 = strings.TrimPrefix(text0, "+")
 		}
 	}
 

diff --git a/internal/fs/fs_zip.go b/internal/fs/fs_zip.go
@@ -112,10 +112,7 @@ func tryToReadZipArchive(zipPath string, archive *zipFile) {
 
 	// Build an index of all files in the archive
 	for _, file := range reader.File {
-		baseName := file.Name
-		if strings.HasSuffix(baseName, "/") {
-			baseName = baseName[:len(baseName)-1]
-		}
+		baseName := strings.TrimSuffix(file.Name, "/")
 		dirPath := ""
 		if slash := strings.LastIndexByte(baseName, '/'); slash != -1 {
 			dirPath = baseName[:slash]

diff --git a/internal/js_parser/js_parser.go b/internal/js_parser/js_parser.go
@@ -17410,7 +17410,7 @@ func (p *parser) prepareForVisitPass() {
 		if jsxImportSource := p.lexer.JSXImportSourcePragmaComment; jsxImportSource.Text != "" {
 			if !p.options.jsx.AutomaticRuntime {
 				p.log.AddIDWithNotes(logger.MsgID_JS_UnsupportedJSXComment, logger.Warning, &p.tracker, jsxImportSource.Range,
-					fmt.Sprintf("The JSX import source cannot be set without also enabling React's \"automatic\" JSX transform"),
+					"The JSX import source cannot be set without also enabling React's \"automatic\" JSX transform",
 					[]logger.MsgData{{Text: "You can enable React's \"automatic\" JSX transform for this file by using a \"@jsxRuntime automatic\" comment."}})
 			} else {
 				p.options.jsx.ImportSource = jsxImportSource.Text

diff --git a/internal/resolver/package_json.go b/internal/resolver/package_json.go
@@ -1376,7 +1376,6 @@ func (r resolverQuery) esmPackageTargetReverseResolve(
 					return true, keyWithoutTrailingStar + starData, target.firstToken
 				}
 			}
-			break
 		}
 
 	case pjObject:

diff --git a/pkg/api/api_impl.go b/pkg/api/api_impl.go
@@ -540,13 +540,11 @@ func validateResolveExtensions(log logger.Log, order []string) []string {
 
 func validateLoaders(log logger.Log, loaders map[string]Loader) map[string]config.Loader {
 	result := bundler.DefaultExtensionToLoaderMap()
-	if loaders != nil {
-		for ext, loader := range loaders {
-			if ext != "" && !isValidExtension(ext) {
-				log.AddError(nil, logger.Range{}, fmt.Sprintf("Invalid file extension: %q", ext))
-			}
-			result[ext] = validateLoader(loader)
+	for ext, loader := range loaders {
+		if ext != "" && !isValidExtension(ext) {
+			log.AddError(nil, logger.Range{}, fmt.Sprintf("Invalid file extension: %q", ext))
 		}
+		result[ext] = validateLoader(loader)
 	}
 	return result
 }