Merge #4161

4161: lsp-types 0.74 r=kjeremy a=kjeremy

* Fixes a bunch of param types to take partial progress into account.
* Will allow us to support insert/replace text in completions

Co-authored-by: kjeremy <kjeremy@gmail.com>

diff --combined crates/rust-analyzer/src/conv.rs
index ffe3ea84d759a25fbf959aaf11a87c74c7d950d8,f7e65372d966e6f08c176e05087535c069d68e9b..7be5ebcdb5a0d13599cc5a8d628c48186cc46936
--- 1/crates/rust-analyzer/src/conv.rs
--- 2/crates/rust-analyzer/src/conv.rs
+++ b/crates/rust-analyzer/src/conv.rs
@@@ -25,8 -25,7 +25,8 @@@ use crate::
      Result,
  };
  use semantic_tokens::{
 -    ATTRIBUTE, BUILTIN_TYPE, ENUM_MEMBER, LIFETIME, TYPE_ALIAS, UNION, UNRESOLVED_REFERENCE,
 +    ATTRIBUTE, BUILTIN_TYPE, ENUM_MEMBER, FORMAT_SPECIFIER, LIFETIME, TYPE_ALIAS, UNION,
 +    UNRESOLVED_REFERENCE,
  };
  
  pub trait Conv {
@@@ -150,7 -149,7 +150,7 @@@ impl ConvWith<(&LineIndex, LineEndings)
              detail: self.detail().map(|it| it.to_string()),
              filter_text: Some(self.lookup().to_string()),
              kind: self.kind().map(|it| it.conv()),
-             text_edit: Some(text_edit),
+             text_edit: Some(text_edit.into()),
              additional_text_edits: Some(additional_text_edits),
              documentation: self.documentation().map(|it| it.conv()),
              deprecated: Some(self.deprecated()),
@@@ -382,7 -381,6 +382,7 @@@ impl Conv for Highlight 
              HighlightTag::Attribute => ATTRIBUTE,
              HighlightTag::Keyword => SemanticTokenType::KEYWORD,
              HighlightTag::UnresolvedReference => UNRESOLVED_REFERENCE,
 +            HighlightTag::FormatSpecifier => FORMAT_SPECIFIER,
          };
  
          for modifier in self.modifiers.iter() {