Reorder typeHierarchy/* requests after textDocument/*

src/request.rs

@@ -132,12 +132,6 @@ macro_rules! lsp_request {
     ("callHierarchy/outgoingCalls") => {
         $crate::request::CallHierarchyOutgoingCalls
     };
-    ("typeHierarchy/supertypes") => {
-        $crate::request::TypeHierarchySupertypes
-    };
-    ("typeHierarchy/subtypes") => {
-        $crate::request::TypeHierarchySubtypes
-    };
     ("textDocument/moniker") => {
         $crate::request::MonikerRequest
     };
@@ -165,6 +159,12 @@ macro_rules! lsp_request {
     ("textDocument/inlineValue") => {
         $crate::request::InlineValueRequest
     };
+    ("typeHierarchy/supertypes") => {
+        $crate::request::TypeHierarchySupertypes
+    };
+    ("typeHierarchy/subtypes") => {
+        $crate::request::TypeHierarchySubtypes
+    };
     ("workspace/willCreateFiles") => {
         $crate::request::WillCreateFiles
     };
@@ -712,45 +712,6 @@ impl Request for CallHierarchyOutgoingCalls {
     const METHOD: &'static str = "callHierarchy/outgoingCalls";
 }
 
-/// The type hierarchy request is sent from the client to the server to return a type hierarchy for
-/// the language element of given text document positions. Will return null if the server couldn’t
-/// infer a valid type from the position. The type hierarchy requests are executed in two steps:
-///
-/// 1. first a type hierarchy item is prepared for the given text document position.
-/// 2. for a type hierarchy item the supertype or subtype type hierarchy items are resolved.
-pub enum TypeHierarchyPrepare {}
-
-impl Request for TypeHierarchyPrepare {
-    type Params = TypeHierarchyPrepareParams;
-    type Result = Option<Vec<TypeHierarchyItem>>;
-    const METHOD: &'static str = "textDocument/prepareTypeHierarchy";
-}
-
-/// The `typeHierarchy/supertypes` request is sent from the client to the server to resolve the
-/// supertypes for a given type hierarchy item. Will return null if the server couldn’t infer a
-/// valid type from item in the params. The request doesn’t define its own client and server
-/// capabilities. It is only issued if a server registers for the
-/// `textDocument/prepareTypeHierarchy` request.
-pub enum TypeHierarchySupertypes {}
-
-impl Request for TypeHierarchySupertypes {
-    type Params = TypeHierarchySupertypesParams;
-    type Result = Option<Vec<TypeHierarchyItem>>;
-    const METHOD: &'static str = "typeHierarchy/supertypes";
-}
-
-/// The `typeHierarchy/subtypes` request is sent from the client to the server to resolve the
-/// subtypes for a given type hierarchy item. Will return null if the server couldn’t infer a valid
-/// type from item in the params. The request doesn’t define its own client and server capabilities.
-/// It is only issued if a server registers for the textDocument/prepareTypeHierarchy request.
-pub enum TypeHierarchySubtypes {}
-
-impl Request for TypeHierarchySubtypes {
-    type Params = TypeHierarchySubtypesParams;
-    type Result = Option<Vec<TypeHierarchyItem>>;
-    const METHOD: &'static str = "typeHierarchy/subtypes";
-}
-
 pub enum SemanticTokensFullRequest {}
 
 impl Request for SemanticTokensFullRequest {
@@ -905,6 +866,45 @@ impl Request for InlineValueRefreshRequest {
     const METHOD: &'static str = "workspace/inlineValue/refresh";
 }
 
+/// The type hierarchy request is sent from the client to the server to return a type hierarchy for
+/// the language element of given text document positions. Will return null if the server couldn’t
+/// infer a valid type from the position. The type hierarchy requests are executed in two steps:
+///
+/// 1. first a type hierarchy item is prepared for the given text document position.
+/// 2. for a type hierarchy item the supertype or subtype type hierarchy items are resolved.
+pub enum TypeHierarchyPrepare {}
+
+impl Request for TypeHierarchyPrepare {
+    type Params = TypeHierarchyPrepareParams;
+    type Result = Option<Vec<TypeHierarchyItem>>;
+    const METHOD: &'static str = "textDocument/prepareTypeHierarchy";
+}
+
+/// The `typeHierarchy/supertypes` request is sent from the client to the server to resolve the
+/// supertypes for a given type hierarchy item. Will return null if the server couldn’t infer a
+/// valid type from item in the params. The request doesn’t define its own client and server
+/// capabilities. It is only issued if a server registers for the
+/// `textDocument/prepareTypeHierarchy` request.
+pub enum TypeHierarchySupertypes {}
+
+impl Request for TypeHierarchySupertypes {
+    type Params = TypeHierarchySupertypesParams;
+    type Result = Option<Vec<TypeHierarchyItem>>;
+    const METHOD: &'static str = "typeHierarchy/supertypes";
+}
+
+/// The `typeHierarchy/subtypes` request is sent from the client to the server to resolve the
+/// subtypes for a given type hierarchy item. Will return null if the server couldn’t infer a valid
+/// type from item in the params. The request doesn’t define its own client and server capabilities.
+/// It is only issued if a server registers for the textDocument/prepareTypeHierarchy request.
+pub enum TypeHierarchySubtypes {}
+
+impl Request for TypeHierarchySubtypes {
+    type Params = TypeHierarchySubtypesParams;
+    type Result = Option<Vec<TypeHierarchyItem>>;
+    const METHOD: &'static str = "typeHierarchy/subtypes";
+}
+
 #[cfg(test)]
 mod test {
     use super::*;