gopls/internal/settings: correct SemanticTokenTypes source

danztran · gopherbot · commit d740adf9c34b · 2025-02-26T09:49:05.000-08:00
fix golang/go#71964 Change-Id: I2694023636272ea971880865a4f2cb6d9192d7d5 GitHub-Last-Rev: c81d388 GitHub-Pull-Request: #564 Reviewed-on: https://go-review.googlesource.com/c/tools/+/652655 Reviewed-by: Hongxiang Jiang <hxjiang@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Robert Findley <rfindley@google.com> Auto-Submit: Hongxiang Jiang <hxjiang@golang.org>
diff --git a/gopls/internal/settings/settings.go b/gopls/internal/settings/settings.go
@@ -1356,7 +1356,7 @@ func (o *Options) EnabledSemanticTokenModifiers() map[semtok.Modifier]bool {
 // EncodeSemanticTokenTypes returns a map of types to boolean.
 func (o *Options) EnabledSemanticTokenTypes() map[semtok.Type]bool {
 	copy := make(map[semtok.Type]bool, len(o.SemanticTokenTypes))
-	for k, v := range o.SemanticTokenModifiers {
+	for k, v := range o.SemanticTokenTypes {
 		copy[semtok.Type(k)] = v
 	}
 	if o.NoSemanticString {

Original file line number	Diff line number	Diff line change
`@@ -1356,7 +1356,7 @@ func (o *Options) EnabledSemanticTokenModifiers() map[semtok.Modifier]bool {`
`1356`	`1356`	`// EncodeSemanticTokenTypes returns a map of types to boolean.`
`1357`	`1357`	`func (o *Options) EnabledSemanticTokenTypes() map[semtok.Type]bool {`
`1358`	`1358`	`copy := make(map[semtok.Type]bool, len(o.SemanticTokenTypes))`
`1359`		`- for k, v := range o.SemanticTokenModifiers {`
	`1359`	`+ for k, v := range o.SemanticTokenTypes {`
`1360`	`1360`	`copy[semtok.Type(k)] = v`
`1361`	`1361`	`}`
`1362`	`1362`	`if o.NoSemanticString {`