From cb1c96cda804b2bfa160d21aa199ced07e45120e Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 24 Feb 2026 09:20:30 -0800 Subject: [PATCH 1/3] Make color recognition more specific --- src/io/flutter/editor/FlutterColorProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/io/flutter/editor/FlutterColorProvider.java b/src/io/flutter/editor/FlutterColorProvider.java index c705c81c72..690b416c62 100644 --- a/src/io/flutter/editor/FlutterColorProvider.java +++ b/src/io/flutter/editor/FlutterColorProvider.java @@ -45,6 +45,9 @@ public Color getColorFrom(@NotNull PsiElement element) { if (parent.getNode().getElementType() == DartTokenTypes.ARRAY_ACCESS_EXPRESSION) { // Colors.blue[200] + if (!refExpr.getFirstChild().getText().matches("(Cupertino)?Colors")) { + return null; + } if (name.equals(refExpr.getFirstChild().getText()) && refExpr.getChildren().length > 1) { // Avoid duplicate resolves. return null; @@ -116,7 +119,7 @@ else if (parent.getNode().getElementType() == DartTokenTypes.SIMPLE_TYPE) { // name.equals(refExpr.getFirstChild().getText()) -> Colors.blue final PsiElement idNode = refExpr.getFirstChild(); if (idNode == null) return null; - if (name.equals(idNode.getText())) { + if (name.matches("(Cupertino)?Colors") && name.equals(idNode.getText())) { final PsiElement selectorNode = refExpr.getLastChild(); if (selectorNode == null) return null; final String code = AstBufferUtil.getTextSkippingWhitespaceComments(selectorNode.getNode()); From f03d70ad3dbaf24e7b4907dd91ebcc9539dc9b5c Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 24 Feb 2026 09:25:05 -0800 Subject: [PATCH 2/3] Update src/io/flutter/editor/FlutterColorProvider.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- src/io/flutter/editor/FlutterColorProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io/flutter/editor/FlutterColorProvider.java b/src/io/flutter/editor/FlutterColorProvider.java index 690b416c62..453462acb1 100644 --- a/src/io/flutter/editor/FlutterColorProvider.java +++ b/src/io/flutter/editor/FlutterColorProvider.java @@ -45,7 +45,7 @@ public Color getColorFrom(@NotNull PsiElement element) { if (parent.getNode().getElementType() == DartTokenTypes.ARRAY_ACCESS_EXPRESSION) { // Colors.blue[200] - if (!refExpr.getFirstChild().getText().matches("(Cupertino)?Colors")) { + if (!refExpr.getFirstChild().getText().equals("Colors") && !refExpr.getFirstChild().getText().equals("CupertinoColors")) { return null; } if (name.equals(refExpr.getFirstChild().getText()) && refExpr.getChildren().length > 1) { From e7169beed435ba47d64a50e2c9dd1a0492a7a3a2 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 24 Feb 2026 09:25:12 -0800 Subject: [PATCH 3/3] Update src/io/flutter/editor/FlutterColorProvider.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- src/io/flutter/editor/FlutterColorProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io/flutter/editor/FlutterColorProvider.java b/src/io/flutter/editor/FlutterColorProvider.java index 453462acb1..31dfab6c88 100644 --- a/src/io/flutter/editor/FlutterColorProvider.java +++ b/src/io/flutter/editor/FlutterColorProvider.java @@ -119,7 +119,7 @@ else if (parent.getNode().getElementType() == DartTokenTypes.SIMPLE_TYPE) { // name.equals(refExpr.getFirstChild().getText()) -> Colors.blue final PsiElement idNode = refExpr.getFirstChild(); if (idNode == null) return null; - if (name.matches("(Cupertino)?Colors") && name.equals(idNode.getText())) { + if ((name.equals("Colors") || name.equals("CupertinoColors")) && name.equals(idNode.getText())) { final PsiElement selectorNode = refExpr.getLastChild(); if (selectorNode == null) return null; final String code = AstBufferUtil.getTextSkippingWhitespaceComments(selectorNode.getNode());