Refine types display.

src/types/dynamic.rs

@@ -546,44 +546,66 @@ impl Hash for Dynamic {
 /// Map the name of a standard type into a friendly form.
 #[inline]
 #[must_use]
-pub(crate) fn map_std_type_name(name: &str) -> &str {
+pub(crate) fn map_std_type_name(name: &str, shorthands: bool) -> &str {
+    let name = name.trim();
+
+    if name.starts_with("rhai::") {
+        return map_std_type_name(&name[6..], shorthands);
+    }
+
     if name == type_name::<String>() {
-        return "string";
+        return if shorthands { "string" } else { "String" };
     }
     if name == type_name::<ImmutableString>() {
-        return "string";
+        return if shorthands {
+            "string"
+        } else {
+            "ImmutableString"
+        };
     }
     if name == type_name::<&str>() {
-        return "string";
-    }
-    if name == type_name::<FnPtr>() {
-        return "Fn";
+        return if shorthands { "string" } else { "&str" };
     }
     #[cfg(feature = "decimal")]
     if name == type_name::<rust_decimal::Decimal>() {
-        return "decimal";
+        return if shorthands { "decimal" } else { "Decimal" };
+    }
+    if name == type_name::<FnPtr>() {
+        return if shorthands { "Fn" } else { "FnPtr" };
     }
     #[cfg(not(feature = "no_index"))]
     if name == type_name::<crate::Array>() {
-        return "array";
+        return if shorthands { "array" } else { "Array" };
     }
     #[cfg(not(feature = "no_index"))]
     if name == type_name::<crate::Blob>() {
-        return "blob";
+        return if shorthands { "blob" } else { "Blob" };
     }
     #[cfg(not(feature = "no_object"))]
     if name == type_name::<crate::Map>() {
-        return "map";
+        return if shorthands { "map" } else { "Map" };
     }
     #[cfg(not(feature = "no_std"))]
     if name == type_name::<Instant>() {
-        return "timestamp";
+        return if shorthands { "timestamp" } else { "Instant" };
     }
-    if name == type_name::<ExclusiveRange>() {
-        return "range";
+    if name == type_name::<ExclusiveRange>() || name == "ExclusiveRange" {
+        return if shorthands {
+            "range"
+        } else if cfg!(feature = "only_i32") {
+            "Range<i32>"
+        } else {
+            "Range<i64>"
+        };
     }
-    if name == type_name::<InclusiveRange>() {
-        return "range=";
+    if name == type_name::<InclusiveRange>() || name == "InclusiveRange" {
+        return if shorthands {
+            "range="
+        } else if cfg!(feature = "only_i32") {
+            "RangeInclusive<i32>"
+        } else {
+            "RangeInclusive<i64>"
+        };
     }
 
     name