change signature from underlineType to appendTypeModifiers

Author: xzbdmw

gopls/internal/golang/semtok.go

@@ -217,7 +217,7 @@ func (tv *tokenVisitor) comment(c *ast.Comment, importByName map[string]*types.P
 		case *types.Func:
 			return semtok.TokFunction, nil
 		case *types.TypeName:
-			return underlineType(obj)
+			return semtok.TokType, appendTypeModifiers(nil, obj)
 		case *types.Const, *types.Var:
 			return semtok.TokVariable, nil
 		default:
@@ -484,29 +484,45 @@ func (tv *tokenVisitor) inspect(n ast.Node) (descend bool) {
 	return true
 }
 
-func underlineType(obj types.Object) (semtok.TokenType, []string) {
-	switch obj.Type().Underlying().(type) {
+// appendTypeModifiers appends optional modifiers that describe the top-level
+// type constructor of obj.Type(): "pointer", "map", etc.
+func appendTypeModifiers(mods []string, obj types.Object) []string {
+	switch t := obj.Type().Underlying().(type) {
 	case *types.Interface:
-		return semtok.TokType, []string{"interface"}
+		mods = append(mods, "interface")
 	case *types.Struct:
-		return semtok.TokType, []string{"struct"}
+		mods = append(mods, "struct")
 	case *types.Signature:
-		return semtok.TokType, []string{"signature"}
+		mods = append(mods, "signature")
 	case *types.Pointer:
-		return semtok.TokType, []string{"pointer"}
+		mods = append(mods, "pointer")
 	case *types.Array:
-		return semtok.TokType, []string{"array"}
+		mods = append(mods, "array")
 	case *types.Map:
-		return semtok.TokType, []string{"map"}
+		mods = append(mods, "map")
 	case *types.Slice:
-		return semtok.TokType, []string{"slice"}
+		mods = append(mods, "slice")
 	case *types.Chan:
-		return semtok.TokType, []string{"chan"}
+		mods = append(mods, "chan")
 	case *types.Basic:
-		return semtok.TokType, []string{"defaultLibrary"}
-	default:
-		return semtok.TokType, nil
+		mods = append(mods, "defaultLibrary")
+		switch t.Kind() {
+		case types.Invalid:
+			mods = append(mods, "invalid")
+		case types.String:
+			mods = append(mods, "string")
+		case types.Bool:
+			mods = append(mods, "bool")
+		case types.UnsafePointer:
+			mods = append(mods, "pointer")
+		default:
+			info := t.Info()
+			if info == types.IsFloat || info == types.IsComplex || info == types.IsInteger {
+				mods = append(mods, "number")
+			}
+		}
 	}
+	return mods
 }
 
 func (tv *tokenVisitor) ident(id *ast.Ident) {
@@ -562,8 +578,7 @@ func (tv *tokenVisitor) ident(id *ast.Ident) {
 		if is[*types.TypeParam](aliases.Unalias(obj.Type())) {
 			emit(semtok.TokTypeParam)
 		} else {
-			tok, mods := underlineType(obj)
-			emit(tok, mods...)
+			emit(semtok.TokType, appendTypeModifiers(nil, obj)...)
 		}
 	case *types.Var:
 		if is[*types.Signature](aliases.Unalias(obj.Type())) {
@@ -820,15 +835,11 @@ func (tv *tokenVisitor) definitionFor(id *ast.Ident, obj types.Object) (semtok.T
 			if fld, ok := fldm.(*ast.Field); ok {
 				// if len(fld.names) == 0 this is a semtok.TokType, being used
 				if len(fld.Names) == 0 {
-					tok, mods := underlineType(obj)
-					modifiers = append(modifiers, mods...)
-					return tok, modifiers
+					return semtok.TokType, appendTypeModifiers(nil, obj)
 				}
 				return semtok.TokVariable, modifiers
 			}
-			tok, mods := underlineType(obj)
-			modifiers = append(modifiers, mods...)
-			return tok, modifiers
+			return semtok.TokType, appendTypeModifiers(modifiers, obj)
 		}
 	}
 	// can't happen

gopls/internal/protocol/semantic.go

@@ -52,6 +52,7 @@ var (
 	semanticModifiers = [...]string{
 		"declaration", "definition", "readonly", "static",
 		"deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary",
-		"interface", "struct", "signature", "pointer", "array", "map", "slice", "chan",
+		// Additional modifiers
+		"interface", "struct", "signature", "pointer", "array", "map", "slice", "chan", "string", "number", "bool", "invalid",
 	}
 )

gopls/internal/test/integration/fake/editor.go

@@ -354,7 +354,7 @@ func clientCapabilities(cfg EditorConfig) (protocol.ClientCapabilities, error) {
 		"declaration", "definition", "readonly", "static",
 		"deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary",
 		// Additional modifiers supported by this client:
-		"interface", "struct", "signature", "pointer", "array", "map", "slice", "chan",
+		"interface", "struct", "signature", "pointer", "array", "map", "slice", "chan", "string", "number", "bool", "invalid",
 	}
 	// The LSP tests have historically enabled this flag,
 	// but really we should test both ways for older editors.