Fix highlighting in Sylvia examples (#210)

Author: jawoznia

docs-test-gen/templates/sylvia/cw_storage_contract.tpl

@@ -1,12 +1,13 @@
 #![allow(unexpected_cfgs, dead_code, unused_variables, unused_imports, clippy::new_without_default)]
 
-use sylvia::cw_std::{Addr, Binary, Coin, entry_point, Reply, SubMsg, WasmMsg, to_json_binary, DepsMut, Empty, Env, IbcChannelOpenMsg, IbcChannelOpenResponse, Response, StdError, StdResult, SubMsgResult};
+use sylvia::cw_std::{Addr, Binary, Coin, entry_point, MessageInfo, Reply, SubMsg, WasmMsg, to_json_binary, DepsMut, Empty, Env, IbcChannelOpenMsg, IbcChannelOpenResponse, Response, StdError, StdResult, SubMsgResult};
 use sylvia::{contract, entry_points, interface};
-use sylvia::types::Remote;
+use sylvia::types::{Remote, CustomMsg, CustomQuery};
 use sylvia::ctx::{InstantiateCtx, QueryCtx, ExecCtx, ReplyCtx, SudoCtx, MigrateCtx};
 use sylvia::cw_schema::cw_serde;
 use cw_utils::MsgInstantiateContractResponse;
 use cw_storage_plus::Item;
+use std::marker::PhantomData;
 
 pub mod external_contract {
     use super::*;
@@ -38,6 +39,11 @@ pub enum ExternalQueryMsg {
 #[cw_serde]
 pub struct ExternalResponse {}
 
+#[cw_serde]
+pub struct SomeResponse;
+
+pub type SomeResult = StdResult<SomeResponse>;
+
 #[test]
 fn doctest() {
     pub mod contract_code {

docs-test-gen/templates/sylvia/empty.tpl

@@ -1,13 +1,17 @@
 #![allow(unexpected_cfgs, dead_code, unused_variables, unused_imports, clippy::new_without_default)]
 
-use sylvia::cw_std::{Addr, Binary, Coin, entry_point, Reply, SubMsg, WasmMsg, to_json_binary, DepsMut, Empty, Env, IbcChannelOpenMsg, IbcChannelOpenResponse, Response, StdError, StdResult, SubMsgResult};
+use sylvia::cw_std::{Addr, Binary, Coin, entry_point, MessageInfo, Reply, SubMsg, WasmMsg, to_json_binary, DepsMut, Empty, Env, IbcChannelOpenMsg, IbcChannelOpenResponse, Response, StdError, StdResult, SubMsgResult};
 use sylvia::{contract, entry_points, interface};
-use sylvia::types::Remote;
+use sylvia::types::{Remote, CustomMsg, CustomQuery};
 use sylvia::ctx::{InstantiateCtx, QueryCtx, ExecCtx, ReplyCtx, SudoCtx, MigrateCtx};
 use sylvia::cw_schema::cw_serde;
 use cw_utils::MsgInstantiateContractResponse;
 use cw_storey::CwStorage;
 use external_contract::ExternalContract;
+use std::marker::PhantomData;
+use external_interface::SomeInterface;
+use serde::{Deserialize, Serialize};
+use serde::de::DeserializeOwned;
 
 pub mod external_contract {
     use sylvia::contract;
@@ -44,6 +48,20 @@ pub enum ExternalQueryMsg {
     Count {}
 }
 
+#[cw_serde]
+pub struct ExampleMsg {}
+
+#[cw_serde]
+pub struct ExampleQuery {}
+
+impl sylvia::cw_std::CustomMsg for ExampleMsg {}
+
+impl sylvia::cw_std::CustomQuery for ExampleQuery {}
+
+#[cw_serde]
+pub struct SomeResponse;
+
+
 #[cw_serde]
 pub struct ExternalResponse {}
 

docs-test-gen/templates/sylvia/storey_contract.tpl

@@ -1,13 +1,14 @@
 #![allow(unexpected_cfgs, dead_code, unused_variables, unused_imports, clippy::new_without_default)]
 
-use sylvia::cw_std::{Addr, Binary, Coin, entry_point, Reply, SubMsg, WasmMsg, to_json_binary, DepsMut, Empty, Env, IbcChannelOpenMsg, IbcChannelOpenResponse, Response, StdError, StdResult, SubMsgResult};
+use sylvia::cw_std::{Addr, Binary, Coin, entry_point, MessageInfo, Reply, SubMsg, WasmMsg, to_json_binary, DepsMut, Empty, Env, IbcChannelOpenMsg, IbcChannelOpenResponse, Response, StdError, StdResult, SubMsgResult};
 use sylvia::{contract, entry_points, interface};
-use sylvia::types::Remote;
+use sylvia::types::{Remote, CustomMsg, CustomQuery};
 use sylvia::ctx::{InstantiateCtx, QueryCtx, ExecCtx, ReplyCtx, SudoCtx, MigrateCtx};
 use sylvia::cw_schema::cw_serde;
 use cw_utils::MsgInstantiateContractResponse;
 use cw_storey::CwStorage;
 use cw_storey::containers::Item;
+use std::marker::PhantomData;
 
 pub mod external_contract {
     use super::*;

src/pages/sylvia/basics/contract-structure.mdx

@@ -12,7 +12,7 @@ state and define a behavior.
 <Tabs items={['Storey', 'StoragePlus']}>
   <Tabs.Tab>
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 use cw_storey::containers::Item;
 
 pub struct CounterContract { pub count: Item<u64>, }
@@ -21,8 +21,8 @@ pub struct CounterContract { pub count: Item<u64>, }
   </Tabs.Tab>
   <Tabs.Tab>
 
-```rust, template="sylvia-empty"
-use sylvia::cw_storage_plus::Item;
+```rust template="sylvia-empty"
+use cw_storage_plus::Item;
 
 pub struct CounterContract { pub count: Item<u64>, }
 ```
@@ -38,18 +38,23 @@ Let's take a look at the behavior implementation.
 <Tabs items={['Storey', 'StoragePlus']}>
   <Tabs.Tab>
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 use cosmwasm_schema::cw_serde;
 use cw_storey::CwStorage;
+use cw_storey::containers::Item;
 use sylvia::contract;
 use sylvia::cw_std::{Response, StdError, StdResult};
-use sylvia::types::{ExecCtx, InstantiateCtx, QueryCtx};
+use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
 
 #[cw_serde]
 pub struct CountResponse {
     pub count: u64,
 }
 
+pub struct CounterContract {
+    pub count: Item<u64>,
+}
+
 #[cfg_attr(not(feature = "library"), sylvia::entry_points)]
 #[contract]
 impl CounterContract {
@@ -94,17 +99,22 @@ impl CounterContract {
   </Tabs.Tab>
   <Tabs.Tab>
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
+use cw_storage_plus::Item;
 use cosmwasm_schema::cw_serde;
 use sylvia::contract;
 use sylvia::cw_std::{Response, StdError, StdResult};
-use sylvia::types::{ExecCtx, InstantiateCtx, QueryCtx};
+use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
 
 #[cw_serde]
 pub struct CountResponse {
     pub count: u64,
 }
 
+pub struct CounterContract {
+    pub count: Item<u64>,
+}
+
 #[cfg_attr(not(feature = "library"), sylvia::entry_points)]
 #[contract]
 impl CounterContract {

src/pages/sylvia/basics/interoperability.mdx

@@ -241,7 +241,7 @@ type provides all the API as the MultiTest counterpart, exposing the underlying
 support for using the Sylvia-generated helpers. It can also be used to simulate the execution of
 standard CosmWasm contracts as well
 
-```rust, template="sylvia-empty"
+```rust
 use sylvia::multitest::App;
 use sylvia::cw_multi_test::BasicMtApp;
 
@@ -259,7 +259,7 @@ We can access the underlying
 [`store_code`](https://docs.rs/cw-multi-test/latest/cw_multi_test/struct.App.html#method.store_code)
 of the CosmWasm contract.
 
-```rust, template="sylvia-empty"
+```rust
 fn cosmwasm_contract() -> Box<dyn Contract<Empty>> { ... }
 
 let cosmwasm_code = app.app_mut().store_code(cosmwasm_contract());
@@ -268,7 +268,7 @@ let cosmwasm_code = app.app_mut().store_code(cosmwasm_contract());
 To instantiate the CosmWasm contract, we will also use the
 [`app_mut`](https://docs.rs/sylvia/latest/sylvia/multitest/struct.App.html#method.app_mut).
 
-```rust, template="sylvia-empty"
+```rust
 let cosmwasm_contract = app
     .app_mut()
     .instantiate_contract(

src/pages/sylvia/macros/attributes/message.mdx

@@ -21,12 +21,12 @@ List of macros supporting the `sv::messages` attribute:
 
 ## Usage
 
-```rust, template="sylvia-empty"
+```rust
 pub mod interface {
     use cosmwasm_schema::cw_serde;
     use sylvia::cw_std::{Response, StdError, StdResult};
     use sylvia::interface;
-    use sylvia::types::{ExecCtx, QueryCtx};
+    use sylvia::ctx::{ExecCtx, QueryCtx};
 
     #[cw_serde]
     pub struct InterfaceQueryResp {}
@@ -47,9 +47,9 @@ pub mod contract {
     use cosmwasm_std::StdError;
     use sylvia::contract;
     use sylvia::cw_std::{Response, StdResult};
-    use sylvia::types::{ExecCtx, InstantiateCtx, QueryCtx};
+    use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
 
-    use crate::interface::{Interface, InterfaceQueryResp};
+    use super::interface::{Interface, InterfaceQueryResp};
 
     pub struct CounterContract;
 
@@ -77,7 +77,7 @@ pub mod contract {
 
         fn interface_query(&self, ctx: QueryCtx) -> StdResult<InterfaceQueryResp> {
             // Your logic here
-            Ok(Response::new())
+            Ok(InterfaceQueryResp {})
         }
     }
 }

src/pages/sylvia/macros/attributes/msg.mdx

@@ -83,7 +83,7 @@ requires however additional action. Due to
 macro derive on generated `query` message, we have to explicitly provide the return type, as the
 macro wouldn't be able to deduce that from the alias.
 
-```rust, template="sylvia-cw-storage-contract"
+```rust template="sylvia-cw-storage-contract"
 #[sv::msg(query, resp=SomeResponse)]
 fn some_query(&self, ctx: QueryCtx) -> SomeResult {
     Ok(SomeResponse)

src/pages/sylvia/macros/attributes/override-entry-point.mdx

@@ -25,7 +25,7 @@ List of macros supporting the `sv::override_entry_point` attribute:
 
 ## Usage
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 use self::sv::ContractExecMsg;
 
 pub mod entrypoints {
@@ -81,7 +81,7 @@ that in the entry point.
 
 An example of such an approach:
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 use self::sv::ContractExecMsg;
 
 pub mod entrypoints {

src/pages/sylvia/macros/contract.mdx

@@ -32,7 +32,7 @@ List of attributes supported by
 
 ## Usage
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 pub struct Contract;
 
 #[cw_serde]
@@ -94,7 +94,7 @@ functionality of one contract with another one. In such a case you might want to
 possibility for the user to use it with types that suits their purpose. You can do that by defining
 generics on your contract.
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 use cw_storage_plus::Item;
 
 pub struct Contract<ExecParamT, FieldT> {
@@ -178,7 +178,7 @@ it makes testing it in the [MultiTest](../../cw-multi-test) environment with dif
 messages tricky. We recommend that if your contract is meant to be chain agnostic, define it with a
 generic custom message and custom query.
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 pub struct Contract<CMsgT, CQueryT> {
     _phantom: PhantomData<(CMsgT, CQueryT)>,
 }

src/pages/sylvia/macros/entry-points.mdx

@@ -25,7 +25,7 @@ List of attributes supported by `entry_points` macro:
 
 ## Usage
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 #[cfg(not(feature = "library"))]
 use sylvia::entry_points;
 
@@ -66,7 +66,7 @@ You can construct your entry points to work with some specific custom types with
 CosmWasm entry points cannot be generic. We are thus forced to provide concrete types to be used in
 place of generic types used in the contract.
 
-```rust, template="sylvia-empty"
+```rust template="sylvia-empty"
 use cw_storage_plus::Item;
 
 #[cfg(not(feature = "library"))]