Codestin Search App

guidezpl · 2021-02-22T14:55:21Z

Fix a bug where the dartdoc for insert_chart_outlined_outlined used the wrong icon

No-ops to icons.dart:

Copy new codepoints instead of moving it
Print useful info when new codepoints is a subset of the existing codepoints
Merge and simplifies identifier rewrites from g3
Refactoring to remove icon style from intermediate data model
Reordering properties

part of go/effortless-flutter-font-updates

Followup in #76691

flutter-dashboard · 2021-02-22T14:55:25Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

willlarche

LGTM

Introduce fullFlutterId and fix a small dartdoc bug

Hixie · 2021-02-23T20:37:54Z

+  int compareTo(_Icon b) {
+    // Sort regular icons before their variants.
+    if (flutterId == b.flutterId && style == IconStyle.regular)
+      return -1;


that doesn't seem right. What if the other one's style is IconStyle.regular and ours isn't? or what if they both are?

I should clarify that this only sorts for a particular icon, of which there can be at most 3 variants + 1 regular.

Hixie · 2021-02-23T20:40:48Z

+    if (flutterId == b.flutterId && style == IconStyle.regular)
+      return -1;
+    return flutterId.compareTo(b.flutterId);
+  }


would it be possible to change the ordering in a separate PR? That way reviewing the PR would be much easier since we could be sure that we were only seeing reorders or only seeing new icons, not a combination.

sure! #76691

This reverts commit c198a16.

This reverts commit 0fac8c1.

Hixie · 2021-02-26T05:09:45Z

    } else if (id.endsWith('_sharp')) {
      style = IconStyle.sharp;
-      shortId = id.replaceAll('_sharp', '');
+      shortId = id.replaceFirst('_sharp', '');


The "replaceFirst" change is an improvement for sure, but it would still get it wrong e.g. if we have something like "foo_outlined_bar_outlined". Can we just do a substring so that we are definitely stripping the end?

Hixie · 2021-02-26T05:11:02Z

@@ -352,65 +362,57 @@ class _Icon {

    if (id.endsWith('_outlined') && id!='insert_chart_outlined') {


I'm really confused about the insert_chart icons. The complete list today seems to be:

insert_chart e7dc insert_chart_outlined e248 insert_chart_outlined_outlined e249 insert_chart_outlined_rounded f278 insert_chart_outlined_sharp ed4a insert_chart_rounded f279 insert_chart_sharp ed4b

Are those two sets of icons? One set of icons with many variants? Seven icons?

It looks like all of this is actually only done so that we can do the ios/android specialization. Maybe there's a better way to do this that allows us to totally ignore the icon type? Just look for icons that startsWith() the icon types we want to specialise?

Yeah, it's two sets insert_chart + 3 variants (top), and insert_chart_outlined + 2 variants (bottom).

I think it's still needed, at the very least, for the css class to display the correct icon in dartdoc. Otherwise, yeah doing this in a style agnostic way would be simpler

Is there a difference between "insert_chart_outlined e248" and "insert_chart_outlined_outlined e249"?

Can we maybe just have the bit where we decide how to style it for CSS look to see if there's a trailing suffix and apply the style appropriately there, rather than actually tracking the style across the whole data model and so on? Seems like this would save us a lot of code and get rid of the bug we're dealing with here at the same time.

Is there a difference between "insert_chart_outlined e248" and "insert_chart_outlined_outlined e249"?

Not that I can tell

I get what you're saying but I think you end up with messier code because there are 3 2 places that depends on the style-related logic

Dartdoc style.htmlSuffix

Determining the shortId (e.g. 5g)

~~Determining thefullFlutterId (five_g, five_g_outlined, five_g_rounded, five_g_sharp)~~ I simplified and removed this.

So, cleaner still to figure out the style in the constructor.

As I reread this I realized I was wrong and could simplify again :) I reordered _Icon to make it more readable. Lmk if this LGTY

Hixie

Update update_icons.dart

9207737

flutter-dashboard Bot added the c: contributor-productivity Team-specific productivity, code health, technical debt. label Feb 22, 2021

google-cla Bot added the cla: yes label Feb 22, 2021

guidezpl added 3 commits February 22, 2021 16:12

Merge and simplify identifier rewrites

8330b17

Update update_icons.dart

2edcd53

Update update_icons.dart

7a61b9b

guidezpl changed the title ~~[Fonts]~~ [Fonts] Improve update_icons script Feb 22, 2021

guidezpl added 2 commits February 22, 2021 16:19

Update update_icons.dart

d8c804b

Add newline

8edcb9c

flutter-dashboard Bot added f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. labels Feb 22, 2021

willlarche approved these changes Feb 22, 2021

View reviewed changes

guidezpl added 2 commits February 22, 2021 17:21

remove whitespace

7fc40c7

Copy instead of moving

dd2661a

guidezpl requested a review from xster February 22, 2021 17:55

guidezpl added 4 commits February 23, 2021 12:57

Fix typo

15e76cd

Clean up code

69e623e

Introduce fullFlutterId and fix a small dartdoc bug

Update update_icons.dart

81f4285

Implement sorting

0fac8c1

guidezpl requested a review from Hixie February 23, 2021 15:57

Remove trailing spaces

c198a16

Hixie reviewed Feb 23, 2021

View reviewed changes

Comment thread dev/tools/update_icons.dart

Hixie reviewed Feb 23, 2021

View reviewed changes

Comment thread dev/tools/update_icons.dart Outdated

Hixie reviewed Feb 23, 2021

View reviewed changes

guidezpl added 2 commits February 24, 2021 11:00

Revert "Remove trailing spaces"

c3ef865

This reverts commit c198a16.

Revert "Implement sorting"

0f8ec23

This reverts commit 0fac8c1.

guidezpl mentioned this pull request Feb 24, 2021

[Fonts] Sort material icons #76691

Merged

Remove trailing space

fe10ea6

guidezpl requested a review from Hixie February 25, 2021 07:44

Add bug number

dcb3231

Hixie reviewed Feb 26, 2021

View reviewed changes

Comment thread dev/tools/update_icons.dart

guidezpl added 2 commits February 26, 2021 09:13

Rename 2d rewrite

793a5d0

Add _replaceLast

586cca4

guidezpl requested a review from Hixie February 27, 2021 09:32

guidezpl and others added 5 commits March 2, 2021 10:49

Add comment

f32331a

Simplify, remove fullFlutterId

b4da8d8

Remove IconStyle and reorder

192b841

xx

ab3fd1e

reorder

fe7b420

Hixie approved these changes Mar 5, 2021

View reviewed changes

Merge branch 'master' into update-fonts

56ebadf

guidezpl merged commit 698d438 into flutter:master Mar 9, 2021

guidezpl deleted the update-fonts branch March 9, 2021 06:53

		@@ -352,65 +362,57 @@ class _Icon {

		if (id.endsWith('_outlined') && id!='insert_chart_outlined') {

Conversation

guidezpl commented Feb 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

flutter-dashboard Bot commented Feb 22, 2021

Uh oh!

willlarche left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guidezpl Feb 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Hixie left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

guidezpl commented Feb 22, 2021 •

edited

Loading

guidezpl Feb 24, 2021 •

edited

Loading