4 files changed, 32 insertions, 10 deletions

diff --git a/crates/proc_macro_api/src/rpc.rs b/crates/proc_macro_api/src/rpc.rs
index 9a68e2cc5..8f7270afe 100644
--- a/crates/proc_macro_api/src/rpc.rs
+++ b/crates/proc_macro_api/src/rpc.rs
@@ -77,7 +77,11 @@ struct TokenIdDef(u32);
 #[derive(Serialize, Deserialize)]
 #[serde(remote = "Delimiter")]
 struct DelimiterDef {
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
     #[serde(with = "DelimiterKindDef")]
     kind: DelimiterKind,
@@ -116,7 +120,11 @@ enum LeafDef {
 #[serde(remote = "Literal")]
 struct LiteralDef {
     text: SmolStr,
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
 }
 
@@ -126,7 +134,11 @@ struct PunctDef {
     char: char,
     #[serde(with = "SpacingDef")]
     spacing: Spacing,
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
 }
 
@@ -141,10 +153,20 @@ enum SpacingDef {
 #[serde(remote = "Ident")]
 struct IdentDef {
     text: SmolStr,
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
 }
 
+mod token_id_def {
+    pub(super) fn skip_if(value: &tt::TokenId) -> bool {
+        *value == tt::TokenId::unspecified()
+    }
+}
+
 mod opt_delimiter_def {
     use super::{Delimiter, DelimiterDef};
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 5c88c3a9b..cda272fd4 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -131,8 +131,8 @@ config_data! {
 
         /// Whether to show inlay type hints for method chains.
         inlayHints_chainingHints: bool      = "true",
-        /// Maximum length for inlay hints. Default is unlimited.
-        inlayHints_maxLength: Option<usize> = "null",
+        /// Maximum length for inlay hints. Set to null to have an unlimited length.
+        inlayHints_maxLength: Option<usize> = "25",
         /// Whether to show function parameter name inlay hints at the call
         /// site.
         inlayHints_parameterHints: bool     = "true",
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index c2521289c..871c65add 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc
@@ -206,10 +206,10 @@ Use markdown syntax for links in hover.
 --
 Whether to show inlay type hints for method chains.
 --
-[[rust-analyzer.inlayHints.maxLength]]rust-analyzer.inlayHints.maxLength (default: `null`)::
+[[rust-analyzer.inlayHints.maxLength]]rust-analyzer.inlayHints.maxLength (default: `25`)::
 +
 --
-Maximum length for inlay hints. Default is unlimited.
+Maximum length for inlay hints. Set to null to have an unlimited length.
 --
 [[rust-analyzer.inlayHints.parameterHints]]rust-analyzer.inlayHints.parameterHints (default: `true`)::
 +
diff --git a/editors/code/package.json b/editors/code/package.json
index faec45276..d263610f5 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -625,8 +625,8 @@
                     "type": "boolean"
                 },
                 "rust-analyzer.inlayHints.maxLength": {
-                    "markdownDescription": "Maximum length for inlay hints. Default is unlimited.",
-                    "default": null,
+                    "markdownDescription": "Maximum length for inlay hints. Set to null to have an unlimited length.",
+                    "default": 25,
                     "type": [
                         "null",
                         "integer"