Merge pull request #76 from TouchInstinct/fix/issue_155_kotlin_and_web

Fix/issue 155 kotlin and web

KotlinServer/utils.twig

@@ -21,7 +21,7 @@ Map<{{ self.formatValueType(valueType.keysType, true, true) }}, {{ self.formatVa
 {%- elseif valueType.baseTypeName == "Array" -%}
 List<{{ self.formatValueType(valueType.itemsType, true, true) }}>
 {%- else -%}
-{{ valueType.baseTypeName }}
+{% include 'blocks/class/classtype.twig' with { type: valueType } %}
 {%- endif -%}
 {% endmacro %}
 

Web-documentation/blocks/classtype.twig

@@ -0,0 +1 @@
+{{- type.baseTypeName -}}{%- include 'type-parameters.twig' with { typeParameters: type.typeParameters } -%}

Web-documentation/blocks/field-row.html.twig

@@ -28,9 +28,9 @@
 
 
         {%- if link is not null -%}
-            <a class="info" href="{{ link }}">{{- utils.formatNullable(valueType.typeName, nullable) -}}</a>
+            <a class="info" href="{{ link }}">{{- utils.formatNullableClassType(valueType, nullable) -}}</a>
         {%- else -%}
-            {{- utils.formatNullable(valueType.typeName, nullable) -}}
+            {{- utils.formatNullableClassType(valueType, nullable) -}}
         {%- endif -%}
     {%- endif -%}
 {%- endmacro -%}

Web-documentation/blocks/type-parameters.twig

@@ -0,0 +1,8 @@
+{%- import '../utils.twig' as utils -%}
+{%- if typeParameters is not empty -%}
+<
+{%- for typeParameter in typeParameters %}
+{{- typeParameter.baseTypeName -}}{%- if not (loop.last) %}, {% endif %}
+{%- endfor -%}
+>
+{%- endif -%}

Web-documentation/utils.twig

@@ -2,6 +2,10 @@
 {{- expr -}}{%- if nullable -%}?{%- endif -%}
 {% endmacro %}
 
+{% macro formatNullableClassType(valueType, nullable) %}
+{% include 'blocks/classtype.twig' with { type: valueType } %}{%- if nullable -%}?{%- endif -%}
+{% endmacro %}
+
 {% macro optionalDescription(optional) %}
 {%- if optional -%}Нет{%- else -%}Да{%- endif -%}
 {% endmacro %}