Remove duplicate consts #773
Conversation
|
(part of #771) |
| '$_convertImportPrefix.base64Decode($base64Lines);'); | ||
| } | ||
|
|
||
| List<String> splitString(String str, int segmentLength) { |
There was a problem hiding this comment.
| List<String> splitString(String str, int segmentLength) { | |
| static List<String> _splitString(String str, int segmentLength) { |
We could also move this to a utility library, along with the stuff in string_escape.dart. We may also have other fairly general utility functions elsewhere in the package.
There was a problem hiding this comment.
sgtm! (I may leave that as work for a future PR)
I in-lined your suggestion into my local edits
| ], | ||
| }; | ||
|
|
||
| /// Descriptor for `PhoneType`. Decode as a `google.protobuf.EnumDescriptorProto`. | ||
| final $typed_data.Uint8List phoneTypeDescriptor = $convert.base64Decode('CglQaG9uZVR5cGUSCgoGTU9CSUxFEAASCAoESE9NRRABEggKBFdPUksQAhIMCghCVVNJTkVTUxAC'); | ||
| final $typed_data.Uint8List phoneTypeDescriptor = $convert.base64Decode('CglQaG9uZVR5cGUSCgoGTU9CSUxFEAASCAoESE9NRRABEggKBFdPUksQAhIMCghCVVNJTkVTUx''AC'); |
There was a problem hiding this comment.
This is longer than 80 characters, is this expected? Is this a problem with the formatter?
I think the intended formatting is something like
final $typed_data.Uint8List phoneTypeDescriptor = $convert.base64Decode(
'CglQaG9uZVR5cGUSCgoGTU9CSUxFEAASCAoESE9NRRABEggKBFdPUksQAhIMCghCVVNJTkVTUx'
'AC');There was a problem hiding this comment.
Ah, good catch.
I adjusted the output a bit so this will look better w/o formatting, but I think what we're seeing here is that these test/goldens/*.pbjson files aren't getting the formatter run on them after generation. (separately, I don't know why they don't end in a .dart extension; they do seem to contain dart code and not json)
| @@ -685,12 +695,12 @@ const _fileIgnores = { | |||
| 'annotate_overrides', | |||
| 'camel_case_types', | |||
| 'constant_identifier_names', | |||
| 'deprecated_member_use', | |||
| 'directives_ordering', | |||
| 'library_prefixes', | |||
| 'non_constant_identifier_names', | |||
| 'prefer_final_fields', | |||
| 'return_of_invalid_type', | |||
There was a problem hiding this comment.
Not related to this PR, but I think we can remove this ignore as well. I tried removing it locally and it doesn't generate any warnings in test protos.
There was a problem hiding this comment.
I'll remove in this PR (I verified what you were saying locally as well)
| '$_convertImportPrefix.base64Decode($base64Lines);'); | ||
| } | ||
|
|
||
| List<String> splitString(String str, int segmentLength) { |
There was a problem hiding this comment.
sgtm! (I may leave that as work for a future PR)
I in-lined your suggestion into my local edits
| @@ -685,12 +695,12 @@ const _fileIgnores = { | |||
| 'annotate_overrides', | |||
| 'camel_case_types', | |||
| 'constant_identifier_names', | |||
| 'deprecated_member_use', | |||
| 'directives_ordering', | |||
| 'library_prefixes', | |||
| 'non_constant_identifier_names', | |||
| 'prefer_final_fields', | |||
| 'return_of_invalid_type', | |||
There was a problem hiding this comment.
I'll remove in this PR (I verified what you were saying locally as well)
| ], | ||
| }; | ||
|
|
||
| /// Descriptor for `PhoneType`. Decode as a `google.protobuf.EnumDescriptorProto`. | ||
| final $typed_data.Uint8List phoneTypeDescriptor = $convert.base64Decode('CglQaG9uZVR5cGUSCgoGTU9CSUxFEAASCAoESE9NRRABEggKBFdPUksQAhIMCghCVVNJTkVTUxAC'); | ||
| final $typed_data.Uint8List phoneTypeDescriptor = $convert.base64Decode('CglQaG9uZVR5cGUSCgoGTU9CSUxFEAASCAoESE9NRRABEggKBFdPUksQAhIMCghCVVNJTkVTUx''AC'); |
There was a problem hiding this comment.
Ah, good catch.
I adjusted the output a bit so this will look better w/o formatting, but I think what we're seeing here is that these test/goldens/*.pbjson files aren't getting the formatter run on them after generation. (separately, I don't know why they don't end in a .dart extension; they do seem to contain dart code and not json)
A few more cleanups to the generated code:
ignore: unnecessary_constdirective)