diff --git a/ChangeLog.md b/ChangeLog.md index 2db1502272b..c9497eedf71 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,14 @@ # Change Log +### 2020-xx-xx - 5.5.1 +Autorest core version: 3.0.6318 + +Modelerfour version: 4.15.421 + +**Bug Fixes** + +- Wrap individual enum descriptions #844 + ### 2020-11-12 - 5.5.0 Autorest core version: 3.0.6318 diff --git a/autorest/codegen/templates/enum.py.jinja2 b/autorest/codegen/templates/enum.py.jinja2 index 83273cbffdb..e56c870a836 100644 --- a/autorest/codegen/templates/enum.py.jinja2 +++ b/autorest/codegen/templates/enum.py.jinja2 @@ -6,5 +6,8 @@ class {{ enum.name }}(with_metaclass(_CaseInsensitiveEnumMeta, {{ enum.enum_type {% endif %} {% for value in enum.values %} - {{ value.name }} = {{ enum.enum_type.get_declaration(value.value) }}{{ " #: " + value.description if value.description else "" }} + {% if value.description %} + #: {{ value.description | wordwrap(width=95, break_long_words=False, wrapstring='\n #: ') }} + {% endif %} + {{ value.name }} = {{ enum.enum_type.get_declaration(value.value) }} {% endfor %} \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py index 0666ddf8a0b..20227bf7255 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py @@ -30,7 +30,11 @@ class ContentType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Content type for upload """ - APPLICATION_PDF = "application/pdf" #: Content Type 'application/pdf'. - IMAGE_JPEG = "image/jpeg" #: Content Type 'image/jpeg'. - IMAGE_PNG = "image/png" #: Content Type 'image/png'. - IMAGE_TIFF = "image/tiff" #: Content Type 'image/tiff'. + #: Content Type 'application/pdf'. + APPLICATION_PDF = "application/pdf" + #: Content Type 'image/jpeg'. + IMAGE_JPEG = "image/jpeg" + #: Content Type 'image/png'. + IMAGE_PNG = "image/png" + #: Content Type 'image/tiff'. + IMAGE_TIFF = "image/tiff" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py index 0666ddf8a0b..20227bf7255 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py @@ -30,7 +30,11 @@ class ContentType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Content type for upload """ - APPLICATION_PDF = "application/pdf" #: Content Type 'application/pdf'. - IMAGE_JPEG = "image/jpeg" #: Content Type 'image/jpeg'. - IMAGE_PNG = "image/png" #: Content Type 'image/png'. - IMAGE_TIFF = "image/tiff" #: Content Type 'image/tiff'. + #: Content Type 'application/pdf'. + APPLICATION_PDF = "application/pdf" + #: Content Type 'image/jpeg'. + IMAGE_JPEG = "image/jpeg" + #: Content Type 'image/png'. + IMAGE_PNG = "image/png" + #: Content Type 'image/tiff'. + IMAGE_TIFF = "image/tiff" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py index 0666ddf8a0b..20227bf7255 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py @@ -30,7 +30,11 @@ class ContentType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Content type for upload """ - APPLICATION_PDF = "application/pdf" #: Content Type 'application/pdf'. - IMAGE_JPEG = "image/jpeg" #: Content Type 'image/jpeg'. - IMAGE_PNG = "image/png" #: Content Type 'image/png'. - IMAGE_TIFF = "image/tiff" #: Content Type 'image/tiff'. + #: Content Type 'application/pdf'. + APPLICATION_PDF = "application/pdf" + #: Content Type 'image/jpeg'. + IMAGE_JPEG = "image/jpeg" + #: Content Type 'image/png'. + IMAGE_PNG = "image/png" + #: Content Type 'image/tiff'. + IMAGE_TIFF = "image/tiff" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py index 0666ddf8a0b..20227bf7255 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py @@ -30,7 +30,11 @@ class ContentType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Content type for upload """ - APPLICATION_PDF = "application/pdf" #: Content Type 'application/pdf'. - IMAGE_JPEG = "image/jpeg" #: Content Type 'image/jpeg'. - IMAGE_PNG = "image/png" #: Content Type 'image/png'. - IMAGE_TIFF = "image/tiff" #: Content Type 'image/tiff'. + #: Content Type 'application/pdf'. + APPLICATION_PDF = "application/pdf" + #: Content Type 'image/jpeg'. + IMAGE_JPEG = "image/jpeg" + #: Content Type 'image/png'. + IMAGE_PNG = "image/png" + #: Content Type 'image/tiff'. + IMAGE_TIFF = "image/tiff" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py index 0666ddf8a0b..20227bf7255 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py @@ -30,7 +30,11 @@ class ContentType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Content type for upload """ - APPLICATION_PDF = "application/pdf" #: Content Type 'application/pdf'. - IMAGE_JPEG = "image/jpeg" #: Content Type 'image/jpeg'. - IMAGE_PNG = "image/png" #: Content Type 'image/png'. - IMAGE_TIFF = "image/tiff" #: Content Type 'image/tiff'. + #: Content Type 'application/pdf'. + APPLICATION_PDF = "application/pdf" + #: Content Type 'image/jpeg'. + IMAGE_JPEG = "image/jpeg" + #: Content Type 'image/png'. + IMAGE_PNG = "image/png" + #: Content Type 'image/tiff'. + IMAGE_TIFF = "image/tiff" diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py index 4195e9bcdb6..e17c44d9d63 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py @@ -40,8 +40,10 @@ class GoblinSharkColor(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): PINK = "pink" GRAY = "gray" BROWN = "brown" - UPPER_RED = "RED" #: Uppercase RED. - LOWER_RED = "red" #: Lowercase RED. + #: Uppercase RED. + UPPER_RED = "RED" + #: Lowercase RED. + LOWER_RED = "red" class MyKind(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py index e419229b59c..e46b8c9d2e5 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py @@ -40,6 +40,10 @@ class DaysOfWeekExtensibleEnum(with_metaclass(_CaseInsensitiveEnumMeta, str, Enu class IntEnum(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - ONE = "1" #: one. - TWO = "2" #: two. - THREE = "3" #: three. + #: This is a really long comment to see what wrapping looks like. This comment is really long and + #: it should wrap for readability. Please wrap. This should wrap. + ONE = "1" + #: two. + TWO = "2" + #: three. + THREE = "3" diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py index 0666ddf8a0b..20227bf7255 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py @@ -30,7 +30,11 @@ class ContentType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """Content type for upload """ - APPLICATION_PDF = "application/pdf" #: Content Type 'application/pdf'. - IMAGE_JPEG = "image/jpeg" #: Content Type 'image/jpeg'. - IMAGE_PNG = "image/png" #: Content Type 'image/png'. - IMAGE_TIFF = "image/tiff" #: Content Type 'image/tiff'. + #: Content Type 'application/pdf'. + APPLICATION_PDF = "application/pdf" + #: Content Type 'image/jpeg'. + IMAGE_JPEG = "image/jpeg" + #: Content Type 'image/png'. + IMAGE_PNG = "image/png" + #: Content Type 'image/tiff'. + IMAGE_TIFF = "image/tiff"